mirror of
https://github.com/goharbor/harbor.git
synced 2024-08-19 02:22:48 +02:00
Merge pull request #7284 from cd1989/make-install-fix
Fix make prepare problem
This commit is contained in:
commit
6df1320b0a
|
@ -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)
|
Loading…
Reference in New Issue
Block a user