Преглед изворни кода

Merge pull request #1915 from porter-dev/belanger/fix-alt-gcr-hosts

Fix alternative GCR hostnames
abelanger5 пре 4 година
родитељ
комит
5691470169
1 измењених фајлова са 14 додато и 1 уклоњено
  1. 14 1
      internal/registry/registry.go

+ 14 - 1
internal/registry/registry.go

@@ -129,9 +129,22 @@ func (r *Registry) listGCRRepositories(
 	// for oauth. This also prevents us from making more requests.
 	client := &http.Client{}
 
+	regURL := r.URL
+
+	if !strings.HasPrefix(regURL, "http") {
+		regURL = fmt.Sprintf("https://%s", regURL)
+	}
+
+	regURLParsed, err := url.Parse(regURL)
+	regHostname := "gcr.io"
+
+	if err == nil {
+		regHostname = regURLParsed.Host
+	}
+
 	req, err := http.NewRequest(
 		"GET",
-		"https://gcr.io/v2/_catalog",
+		fmt.Sprintf("https://%s/v2/_catalog", regHostname),
 		nil,
 	)