Merge pull request goharbor#7827 from ninjadq/cherry-pick-180-fix-ali…

…-oss-storage-issue Fix issue: goharbor#7288
xaleeks · May 16, 2019 · 25bb24c · 25bb24c
2 parents 4aed1b0 + 501c15c
commit 25bb24c
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: