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

Partial revert for "Bugfix for ca_trust_dir"

Browse Source 
# 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
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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"