Merge pull request #7750 from liqiang-fit2cloud/fix-7288

Fix issue: harbor 1.7.4 aliyun oss chartmuseum 500
goharbor · May 16, 2019 · 64cacc9 · 64cacc9
2 parents a9d01a7 + 218889a
commit 64cacc9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/make/photon/prepare/utils/chart.py b/make/photon/prepare/utils/chart.py
@@ -77,9 +77,13 @@ def prepare_chartmuseum(config_dict):
     elif storage_provider_name == 'oss':
         # aliyun OSS
         storage_driver = "alibaba"
-        storage_provider_config_options.append("STORAGE_ALIBABA_BUCKET=%s" % ( storage_provider_config_map.get("bucket") or '') )
+        bucket = storage_provider_config_map.get("bucket") or ''
+        endpoint = storage_provider_config_map.get("endpoint") or ''
+        if endpoint.startswith(bucket + "."):
+            endpoint = endpoint.replace(bucket + ".", "")
+        storage_provider_config_options.append("STORAGE_ALIBABA_BUCKET=%s" % bucket )
+        storage_provider_config_options.append("STORAGE_ALIBABA_ENDPOINT=%s" % endpoint )
         storage_provider_config_options.append("STORAGE_ALIBABA_PREFIX=%s" % ( storage_provider_config_map.get("rootdirectory") or '') )
-        storage_provider_config_options.append("STORAGE_ALIBABA_ENDPOINT=%s" % ( storage_provider_config_map.get("endpoint") or '') )
         storage_provider_config_options.append("ALIBABA_CLOUD_ACCESS_KEY_ID=%s" % ( storage_provider_config_map.get("accesskeyid") or '') )
         storage_provider_config_options.append("ALIBABA_CLOUD_ACCESS_KEY_SECRET=%s" % ( storage_provider_config_map.get("accesskeysecret") or '') )
     else: