diff options
| author | Matthew Jones <matburt@redhat.com> | 2017-09-28 17:37:10 +0200 |
|---|---|---|
| committer | Matthew Jones <matburt@redhat.com> | 2017-09-28 17:37:10 +0200 |
| commit | 128eaaf60f716344a0e1ea47b643a71c6e2853ce (patch) | |
| tree | bf37fdf74760cc00a02b754ea56306325d19273f /installer/local_docker | |
| parent | Merge pull request #298 from st0ne-dot-at/proxy_fix (diff) | |
| download | awx-128eaaf60f716344a0e1ea47b643a71c6e2853ce.tar.xz awx-128eaaf60f716344a0e1ea47b643a71c6e2853ce.zip | |
Fix an issue where mercurial wasn't getting installed in the image
Also fixes an issue assigning proxy environment variables
Diffstat (limited to '')
| -rw-r--r-- | installer/local_docker/tasks/main.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/installer/local_docker/tasks/main.yml b/installer/local_docker/tasks/main.yml index 4915d9e945..0e81ac8a10 100644 --- a/installer/local_docker/tasks/main.yml +++ b/installer/local_docker/tasks/main.yml @@ -187,9 +187,9 @@ links: "{{ awx_web_container_links|list }}" hostname: awxweb env: - http_proxy: "{{ http_proxy | default(omit) }}" - https_proxy: "{{ https_proxy | default(omit) }}" - no_proxy: "{{ no_proxy | default(omit) }}" + http_proxy: "{{ http_proxy | default('') }}" + https_proxy: "{{ https_proxy | default('') }}" + no_proxy: "{{ no_proxy | default('') }}" SECRET_KEY: "{{ awx_secret_key }}" DATABASE_NAME: "{{ pg_database }}" DATABASE_USER: "{{ pg_username }}" @@ -216,9 +216,9 @@ user: root hostname: awx env: - http_proxy: "{{ http_proxy | default(omit) }}" - https_proxy: "{{ https_proxy | default(omit) }}" - no_proxy: "{{ no_proxy | default(omit) }}" + http_proxy: "{{ http_proxy | default('') }}" + https_proxy: "{{ https_proxy | default('') }}" + no_proxy: "{{ no_proxy | default('') }}" SECRET_KEY: "{{ awx_secret_key }}" DATABASE_NAME: "{{ pg_database }}" DATABASE_USER: "{{ pg_username }}" |