Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-03 14:37:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix make prepare problem

Browse Source 
Signed-off-by: cd1989 <chende@caicloud.io>
This commit is contained in:
cd1989 2019-04-03 16:19:04 +08:00
parent ba20da5dd4
commit 27c1bdc5e2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
make/photon/prepare/utils/docker_compose.py
View File

@ -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)