From 6cd77dc6b8e1568aaff8d1e73a298443d7c5012a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?NAHELOU=20S=C3=89BASTIEN?= Date: Wed, 13 Sep 2017 13:56:58 +0200 Subject: [PATCH] add proxy support --- installer/image_build/tasks/main.yml | 16 ++++++++++++++++ installer/inventory | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/installer/image_build/tasks/main.yml b/installer/image_build/tasks/main.yml index 9717a2c5df..ee1b3f6af8 100644 --- a/installer/image_build/tasks/main.yml +++ b/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 }}" diff --git a/installer/inventory b/installer/inventory index 56ee0c8548..bee0865091 100644 --- a/installer/inventory +++ b/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