upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-20 16:35:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix public url shoud not display port is it's default value (#7760)

Browse Source 
if https port is 443 or http port is 80, then only showing url

Signed-off-by: Qian Deng <dengq@vmware.com>
This commit is contained in:
Qian Deng 2019-05-10 16:53:25 +08:00 committed by Wang Yan
parent 7ee9063c2b
commit 439b44c61f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/photon/prepare/utils/configs.py
View File

@ -83,9 +83,15 @@ def parse_yaml_config(config_file_path):
config_dict['public_url'] = configs.get('external_url')
else:
if config_dict['protocol'] == 'https':
config_dict['public_url'] = '{protocol}://{hostname}:{https_port}'.format(**config_dict)
if config_dict['https_port'] == 443:
config_dict['public_url'] = '{protocol}://{hostname}'.format(**config_dict)
else:
config_dict['public_url'] = '{protocol}://{hostname}:{https_port}'.format(**config_dict)
else:
config_dict['public_url'] = '{protocol}://{hostname}:{http_port}'.format(**config_dict)
if config_dict['http_port'] == 80:
config_dict['public_url'] = '{protocol}://{hostname}'.format(**config_dict)
else:
config_dict['public_url'] = '{protocol}://{hostname}:{http_port}'.format(**config_dict)
# DB configs
db_configs = configs.get('database')