From 92b04cffd547dfd5b0273436c11d0e668d2fec13 Mon Sep 17 00:00:00 2001 From: cd1989 Date: Wed, 3 Apr 2019 16:19:04 +0800 Subject: [PATCH] Fix make prepare problem Signed-off-by: cd1989 --- make/photon/prepare/utils/docker_compose.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/make/photon/prepare/utils/docker_compose.py b/make/photon/prepare/utils/docker_compose.py index 8027e36c2..ba7829f96 100644 --- a/make/photon/prepare/utils/docker_compose.py +++ b/make/photon/prepare/utils/docker_compose.py @@ -25,8 +25,6 @@ def prepare_docker_compose(configs, with_clair, with_notary, with_chartmuseum): 'chartmuseum_version': '{}-{}'.format(CHARTMUSEUM_VERSION, VERSION_TAG), 'data_volume': configs['data_volume'], 'log_location': configs['log_location'], - 'cert_key_path': configs['cert_key_path'], - 'cert_path': configs['cert_path'], 'protocol': configs['protocol'], 'http_port': configs['http_port'], 'registry_custom_ca_bundle_path': configs['registry_custom_ca_bundle_path'], @@ -41,4 +39,8 @@ def prepare_docker_compose(configs, with_clair, with_notary, with_chartmuseum): if configs.get('https_port'): rendering_variables['https_port'] = configs['https_port'] + if configs['protocol'] == 'https': + rendering_variables['cert_key_path'] = configs['cert_key_path'] + rendering_variables['cert_path'] = configs['cert_path'] + render_jinja(docker_compose_template_path, docker_compose_yml_path, **rendering_variables) \ No newline at end of file