summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteininger Robert, IR <r.steininger@viennaairport.com>2017-09-26 16:40:04 +0200
committerSteininger Robert, IR <r.steininger@viennaairport.com>2017-09-26 16:40:04 +0200
commit5a95f2c793d37ea3bff87e9fb9ca0f2b385ebec8 (patch)
tree79bb254c25d065c26570886781d6843f6064c337
parentMerge pull request #291 from Zokormazo/fix-const (diff)
downloadawx-5a95f2c793d37ea3bff87e9fb9ca0f2b385ebec8.tar.xz
awx-5a95f2c793d37ea3bff87e9fb9ca0f2b385ebec8.zip
added proxy settings to docker runtimes
-rw-r--r--installer/local_docker/tasks/main.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/installer/local_docker/tasks/main.yml b/installer/local_docker/tasks/main.yml
index c422b97b58..688034a832 100644
--- a/installer/local_docker/tasks/main.yml
+++ b/installer/local_docker/tasks/main.yml
@@ -180,6 +180,9 @@
links: "{{ awx_web_container_links|list }}"
hostname: awxweb
env:
+ 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 }}"
@@ -206,6 +209,9 @@
user: root
hostname: awx
env:
+ 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 }}"
@@ -221,4 +227,3 @@
MEMCACHED_PORT: "11211"
AWX_ADMIN_USER: "{{ default_admin_user|default('admin') }}"
AWX_ADMIN_PASSWORD: "{{ default_admin_password|default('password') }}"
-