Merge pull request #6238 from ktock/urls-fallback-1.5

mxpv · web-flow · commit 5fde9a5b31df · 2021-11-12T10:50:55.000-08:00
[release/1.5] Fix containerd fails to pull OCI image with non-`http(s)://` urls
diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go
@@ -60,6 +60,10 @@ func (r dockerFetcher) Fetch(ctx context.Context, desc ocispec.Descriptor) (io.R
 				log.G(ctx).WithError(err).Debug("failed to parse")
 				continue
 			}
+			if u.Scheme != "http" && u.Scheme != "https" {
+				log.G(ctx).Debug("non-http(s) alternative url is unsupported")
+				continue
+			}
 			log.G(ctx).Debug("trying alternative url")
 
 			// Try this first, parse it
