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

Merge pull request #2430 from dmt/devel

Browse Source 
Fix installer volume definitions

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-10-25 22:12:25 +00:00
committed by GitHub
parent 94083f55c7 6ecd18b2e2
commit 3e4738d948
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
installer/roles/local_docker/tasks/standalone.yml
View File

@@ -82,9 +82,11 @@
state: started state: started
restart_policy: unless-stopped restart_policy: unless-stopped
image: "{{ awx_web_docker_actual_image }}" image: "{{ awx_web_docker_actual_image }}"
volumes: volumes: >
- "{{ project_data_dir + ':/var/lib/awx/projects:z' if project_data_dir is defined else [] }}" {{
- "{{ ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro' if ca_trust_dir is defined else [] }}" ([project_data_dir + ':/var/lib/awx/projects:z'] if project_data_dir is defined else [])
+ ([ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else [])
}}
user: root user: root
ports: ports:
- "{{ host_port }}:8052" - "{{ host_port }}:8052"
@@ -125,8 +127,8 @@
image: "{{ awx_task_docker_actual_image }}" image: "{{ awx_task_docker_actual_image }}"
volumes: > volumes: >
{{ {{
[project_data_dir + ':/var/lib/awx/projects:z'] if project_data_dir is defined else [] ([project_data_dir + ':/var/lib/awx/projects:z'] if project_data_dir is defined else [])
+ [ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else [] + ([ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else [])
}} }}
links: "{{ awx_task_container_links|list }}" links: "{{ awx_task_container_links|list }}"
user: root user: root