Merge pull request #3485 from apostasie/fix-push-bustage

Fix Docker Hub push regression
containerd · Oct 2, 2024 · ff17045 · ff17045
2 parents c156ee6 + 544991a
commit ff17045
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/imgutil/dockerconfigresolver/registryurl.go b/pkg/imgutil/dockerconfigresolver/registryurl.go
@@ -102,8 +102,10 @@ func (rn *RegistryURL) AllIdentifiers() []string {
 
  // Docker behavior: if the domain was index.docker.io over 443, we are allowed to additionally read the canonical
  // docker credentials
- if rn.Hostname() == "index.docker.io" && rn.Port() == standardHTTPSPort {
- fullList = append(fullList, dockerIndexServer)
+ if rn.Port() == standardHTTPSPort {
+ if rn.Hostname() == "index.docker.io" || rn.Hostname() == "registry-1.docker.io" {
+ fullList = append(fullList, dockerIndexServer)
+ }
  }
 
  // Add legacy variants