Partial revert for "Bugfix for ca_trust_dir"

# Conflicts:
#	installer/roles/local_docker/tasks/standalone.yml

# Conflicts:
#	installer/roles/local_docker/tasks/standalone.yml
This commit is contained in:
Daniel Temme 2018-10-12 18:36:05 +02:00 committed by Shane McDonald
parent 9bca937fad
commit 4e9c705997

View File

@ -82,9 +82,11 @@
state: started
restart_policy: unless-stopped
image: "{{ awx_web_docker_actual_image }}"
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 [] }}"
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 []
}}
user: root
ports:
- "{{ host_port }}:8052"