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

Merge branch 'devel' into devel

Browse Source
This commit is contained in:
Yanis Guenane
2018-10-18 18:00:16 +02:00
committed by GitHub
parent 6d0fed6d9a f1a4a62304
commit b185c1e0a2
7 changed files with 63 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@
restart_policy: unless-stopped
image: "{{ awx_web_docker_actual_image }}"
volumes:
- "{{ project_data_dir + ':/var/lib/awx/projects:rw' 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 [] }}"
user: root
ports:
@@ -125,7 +125,7 @@
image: "{{ awx_task_docker_actual_image }}"
volumes: >
{{
[project_data_dir + ':/var/lib/awx/projects:rw'] 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 []
}}
links: "{{ awx_task_container_links|list }}"