Merge pull request #7624 from ninjadq/prepare_for_harbor_tile

Prepare for harbor tile

make/harbor.yml

@@ -45,6 +45,9 @@ data_volume: /data
 #   # for more info about this configuration please refer https://docs.docker.com/registry/configuration/
 #   filesystem:
 #     maxthreads: 100
+#   # set disable to true when you want to disable registry redirect
+#   redirect:
+#     disabled: false
 
 # Clair configuration
 clair: 

make/photon/prepare/templates/docker_compose/docker-compose.yml.jinja

@@ -356,7 +356,7 @@ services:
 {% endif %}
     logging:
       driver: "syslog"
-      options:  
+      options:
         syslog-address: "tcp://127.0.0.1:1514"
         tag: "clair"
     env_file:

make/photon/prepare/templates/registry/config.yml.jinja

@@ -12,6 +12,10 @@ storage:
       enabled: false
   delete:
     enabled: true
+{% if storage_redirect_disabled %}
+  redirect:
+    disabled: true
+{% endif %}
 redis:
   addr: {{redis_host}}:{{redis_port}}
   password: {{redis_password}}

make/photon/prepare/utils/configs.py

@@ -124,6 +124,9 @@ def parse_yaml_config(config_file_path):
         config_dict['storage_provider_name'] = 'filesystem'
         config_dict['storage_provider_config'] = {}
 
+    if storage_config.get('redirect'):
+        config_dict['storage_redirect_disabled'] = storage_config['redirect']['disabled']
+
     # Clair configs
     clair_configs = configs.get("clair") or {}
     config_dict['clair_db'] = 'postgres'

make/photon/prepare/utils/docker_compose.py

@@ -36,12 +36,11 @@ def prepare_docker_compose(configs, with_clair, with_notary, with_chartmuseum):
     storage_config = configs.get('storage_provider_config') or {}
     if storage_config.get('keyfile'):
         rendering_variables['gcs_keyfile'] = storage_config['keyfile']
-    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']
+        rendering_variables['https_port'] = configs['https_port']
 
     uaa_config = configs.get('uaa') or {}
     if uaa_config.get('ca_file'):

make/photon/prepare/utils/registry.py

@@ -29,7 +29,7 @@ def prepare_registry(config_dict):
 def get_storage_provider_info(provider_name, provider_config):
     provider_config_copy = copy.deepcopy(provider_config)
     if provider_name == "filesystem":
-        if not (provider_config_copy and provider_config_copy.has_key('rootdirectory')):
+        if not (provider_config_copy and ('rootdirectory' in provider_config_copy)):
             provider_config_copy['rootdirectory'] = '/storage'
     if provider_name == 'gcs' and provider_config_copy.get('keyfile'):
         provider_config_copy['keyfile'] = '/etc/registry/gcs.key'

make/prepare

@@ -3,7 +3,11 @@ set +e
 
 # If compling source code this dir is harbor's make dir
 # If install harbor via pacakge, this dir is harbor's root dir
-harbor_prepare_path="$( cd "$(dirname "$0")" ; pwd -P )"
+if [[ -n "$HARBOR_BUNDLE_DIR" ]]; then
+    harbor_prepare_path=$HARBOR_BUNDLE_DIR
+else
+    harbor_prepare_path="$( cd "$(dirname "$0")" ; pwd -P )"
+fi
 echo "prepare base dir is set to ${harbor_prepare_path}"
 data_path=$(grep '^[^#]*data_volume:' ${harbor_prepare_path}/harbor.yml | awk '{print $NF}')