External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-01 01:28:09 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix an issue where mercurial wasn't getting installed in the image

Browse Source 
Also fixes an issue assigning proxy environment variables
This commit is contained in:
Matthew Jones
2017-09-28 11:37:10 -04:00
parent cd35704b0b
commit 128eaaf60f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
installer/local_docker/tasks/main.yml
View File

@@ -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 }}"