Merge pull request #2037 from ikke-t/ikke-t-selinux-fix

fixes selinux permissions for awx data.

Reviewed-by: Shane McDonald <me@shanemcd.com>
             https://github.com/shanemcd
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-10-17 19:05:21 +00:00
committed by GitHub

View File

@@ -83,7 +83,7 @@
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: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 [] }}" - "{{ ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro' if ca_trust_dir is defined else [] }}"
user: root user: root
ports: ports:
@@ -125,7 +125,7 @@
image: "{{ awx_task_docker_actual_image }}" image: "{{ awx_task_docker_actual_image }}"
volumes: > 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 [] + [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 }}"