From 41c3e6945062473c3a5cba2425294028702c945a Mon Sep 17 00:00:00 2001 From: Soumik Ghosh Date: Mon, 2 Apr 2018 14:23:23 -0400 Subject: [PATCH] Bind mount to custom certs to --- installer/roles/local_docker/tasks/standalone.yml | 4 ++-- installer/roles/local_docker/templates/docker-compose.yml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/roles/local_docker/tasks/standalone.yml b/installer/roles/local_docker/tasks/standalone.yml index cba2379aa1..5f97f8167a 100644 --- a/installer/roles/local_docker/tasks/standalone.yml +++ b/installer/roles/local_docker/tasks/standalone.yml @@ -83,7 +83,7 @@ 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 [] + + [ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else [] }} user: root ports: @@ -121,7 +121,7 @@ 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 [] + + [ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else [] }} links: "{{ awx_task_container_links|list }}" user: root diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index 36bd546c43..cf1319d01d 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -22,7 +22,7 @@ services: - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}" {% endif %} {% if ca_trust_dir is defined %} - - "{{ ca_trust_dir +':/etc/pki/ca-trust:ro' }}" + - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" {% endif %} {% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) %} {% set awx_container_search_domains_list = awx_container_search_domains.split(',') %} @@ -81,7 +81,7 @@ services: - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}" {% endif %} {% if ca_trust_dir is defined %} - - "{{ ca_trust_dir +':/etc/pki/ca-trust:ro' }}" + - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" {% endif %} {% if (awx_container_search_domains is defined) and (',' in awx_container_search_domains) %} {% set awx_container_search_domains_list = awx_container_search_domains.split(',') %}