diff options
| author | Matthew Jones <bsdmatburt@gmail.com> | 2017-09-13 21:37:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 21:37:21 +0200 |
| commit | e7eeb8670947b2c74edc37b1cf0e671d22303f6e (patch) | |
| tree | bab07c58b73586f4f612a0c87a4d2d482de75795 /installer | |
| parent | Merge pull request #156 from swills/portable-get_system_task_capacity (diff) | |
| parent | add proxy support (diff) | |
| download | awx-e7eeb8670947b2c74edc37b1cf0e671d22303f6e.tar.xz awx-e7eeb8670947b2c74edc37b1cf0e671d22303f6e.zip | |
Merge pull request #154 from snahelou/devel
add proxy support
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/image_build/tasks/main.yml | 16 | ||||
| -rw-r--r-- | installer/inventory | 5 |
2 files changed, 21 insertions, 0 deletions
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 |