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

make tests pass

Browse Source 
Signed-off-by: msc-xdev <m.schiener@xdev-software.de>
This commit is contained in:
msc-xdev 2024-09-02 14:18:50 +02:00
parent 049f698619
commit a9c333dd62
No known key found for this signature in database
GPG Key ID: 8A6FA46FBDD18F2D
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ def prepare_docker_compose(configs, with_trivy):
'http_port': configs['http_port'],
'external_redis': configs['external_redis'],
'external_database': configs['external_database'],
'ip_family': configs['ip_family'],
'with_trivy': with_trivy,
}

3
make/photon/prepare/utils/nginx.py
View File

@ -75,7 +75,8 @@ def render_nginx_template(config_dict):
uid=DEFAULT_UID,
gid=DEFAULT_GID,
internal_tls=config_dict['internal_tls'],
metric=config_dict['metric'])
metric=config_dict['metric'],
ip_family=config_dict['ip_family'])
location_file_pattern = CUSTOM_NGINX_LOCATION_FILE_PATTERN_HTTP
copy_nginx_location_configs_if_exist(nginx_template_ext_dir, nginx_confd_dir, location_file_pattern)