Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-04 17:49:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7284 from cd1989/make-install-fix

Browse Source 
Fix make prepare problem
This commit is contained in:
Wenkai Yin 2019-04-09 18:06:44 +08:00 committed by GitHub
commit 6df1320b0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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), 'chartmuseum_version': '{}-{}'.format(CHARTMUSEUM_VERSION, VERSION_TAG),
'data_volume': configs['data_volume'], 'data_volume': configs['data_volume'],
'log_location': configs['log_location'], 'log_location': configs['log_location'],
'cert_key_path': configs['cert_key_path'],
'cert_path': configs['cert_path'],
'protocol': configs['protocol'], 'protocol': configs['protocol'],
'http_port': configs['http_port'], 'http_port': configs['http_port'],
'registry_custom_ca_bundle_path': configs['registry_custom_ca_bundle_path'], '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'): if configs.get('https_port'):
rendering_variables['https_port'] = configs['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) render_jinja(docker_compose_template_path, docker_compose_yml_path, **rendering_variables)