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

make volume concatenation work

Browse Source 
The second list gets interpreted as part of the else block, effectively
dropping it. Separating both list definitions with braces seems to work.

# Conflicts:
#	installer/roles/local_docker/tasks/standalone.yml
This commit is contained in:
Daniel Temme
2018-10-15 10:44:07 +02:00
committed by Shane McDonald
parent 4e9c705997
commit 6ecd18b2e2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,8 +84,8 @@
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 [] ([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 [])
}} }}
user: root user: root
ports: ports:
@@ -127,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