Add local_docker facility for bind-mounting ca-trust

This implements one possible solution for #411, but does not solve it for
Kubernetes or Openshift installations.

# Conflicts:
#	installer/inventory
This commit is contained in:
Alexander Bauer
2018-03-02 12:43:21 -08:00
committed by Shane McDonald
parent 4fa0d2406a
commit db8df5f724
2 changed files with 11 additions and 3 deletions

View File

@@ -79,7 +79,11 @@
state: started
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 omit }}"
volumes: >
{{
[project_data_dir + ':/var/lib/awx/projects:rw' if project_data_dir is defined else []
+ [ca_trust_dir + ':/etc/pki/ca-trust:ro'] if ca_trust_dir is defined else []
}}
user: root
ports:
- "{{ host_port }}:8052"
@@ -113,7 +117,11 @@
state: started
restart_policy: unless-stopped
image: "{{ awx_task_docker_actual_image }}"
volumes: "{{ project_data_dir + ':/var/lib/awx/projects:rw' if project_data_dir is defined else omit }}"
volumes: >
{{
[project_data_dir + ':/var/lib/awx/projects:rw' if project_data_dir is defined else []
+ [ca_trust_dir + ':/etc/pki/ca-trust:ro'] if ca_trust_dir is defined else []
}}
links: "{{ awx_task_container_links|list }}"
user: root
hostname: awx