From 28e3c635622f8f0b2838277c2770143a5c49c511 Mon Sep 17 00:00:00 2001 From: Jeff Byrnes Date: Wed, 3 Apr 2019 11:11:33 -0400 Subject: [PATCH] Add optional SSL cert to docker-compose install In #3322, this mount was added, but only to the standalone Docker install setup: github.com/ansible/awx/pull/3322/files#diff-596e32ab54a52bfed763f8a639499fe0 This ensures that the SSL cert is loaded when using docker-compose, which is the only Docker-based method available as of v4.0.0 --- .../roles/local_docker/templates/docker-compose.yml.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index 138d0e9871..3fba670f15 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -26,6 +26,9 @@ services: {% if ca_trust_dir is defined %} - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" {% endif %} + {% if ssl_certificate is defined %} + - "{{ ssl_certificate +':/etc/nginx/awxweb.pem: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(',') %} dns_search: @@ -72,6 +75,9 @@ services: {% if ca_trust_dir is defined %} - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" {% endif %} + {% if ssl_certificate is defined %} + - "{{ ssl_certificate +':/etc/nginx/awxweb.pem: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(',') %} dns_search: