Merge pull request #154 from snahelou/devel

add proxy support

installer/image_build/tasks/main.yml

@@ -49,6 +49,10 @@
 
 - name: Build sdist builder image
   docker_image:
+    buildargs:
+      http_proxy: "{{ http_proxy | default('') }}"
+      https_proxy: "{{ https_proxy | default('') }}"
+      no_proxy: "{{ no_proxy | default('') }}"
     path: "image_build/files"
     dockerfile: Dockerfile.sdist
     name: awx_sdist_builder
@@ -58,6 +62,10 @@
 
 - name: Build AWX distribution
   docker_container:
+    env:
+      http_proxy: "{{ http_proxy | default('') }}"
+      https_proxy: "{{ https_proxy | default('') }}"
+      no_proxy: "{{ no_proxy | default('') }}"
     image: "awx_sdist_builder:{{ awx_version }}"
     name: awx_sdist_builder
     state: started
@@ -154,6 +162,10 @@
 
 - name: Build base web image
   docker_image:
+    buildargs:
+      http_proxy: "{{ http_proxy | default('') }}"
+      https_proxy: "{{ https_proxy | default('') }}"
+      no_proxy: "{{ no_proxy | default('') }}"
     path: "{{ docker_base_path }}"
     dockerfile: Dockerfile
     name: "{{ awx_web_image }}"
@@ -162,6 +174,10 @@
 
 - name: Build base task image
   docker_image:
+    buildargs:
+      http_proxy: "{{ http_proxy | default('') }}"
+      https_proxy: "{{ https_proxy | default('') }}"
+      no_proxy: "{{ no_proxy | default('') }}"
     path: "{{ docker_base_path }}"
     dockerfile: Dockerfile.task
     name: "{{ awx_task_image }}"

installer/inventory

@@ -36,3 +36,8 @@ pg_port=5432
 
 # AWX Tunables
 awx_secret_key=aabbcc
+
+# Proxy
+#http_proxy=http://proxy:3128
+#https_proxy=http://proxy:3128
+#no_proxy=mycorp.org