@@ -133,18 +133,25 @@ class DockerRegistryHelper {
133133 }
134134 }
135135
136+ function isDomainDocker ( domainToTest : string ) {
137+ return (
138+ domainToTest . endsWith ( '.docker.io' ) || // *.docker.io/user/image is from Docker Hub
139+ domainToTest . endsWith ( '.docker.com' ) || // *.docker.com/user/image is from Docker Hub
140+ domainToTest === 'docker.com' || // docker.com/user/image is from Docker Hub
141+ domainToTest === 'docker.io' // docker.io/user/image is from Docker Hub
142+ )
143+ }
144+
136145 // if none of the registries explicitly relates to the image name, and no other explicit domain is defined,
137146 // try Docker Hub registry as the default
138147 if (
148+ imageName . split ( '/' ) . length == 1 || // image is from Docker Hub
139149 imageName . split ( '/' ) . length == 2 || // user/image is from Docker Hub
140- imageName . split ( '/' ) [ 0 ] . endsWith ( '.docker.io' ) || // registry-1.docker.io/user/image is from Docker Hub
141- imageName . split ( '/' ) [ 0 ] === 'docker.io' || // registry-1.docker.io/user/image is from Docker Hub
142- imageName . split ( '/' ) [ 0 ] . endsWith ( '.docker.com' ) || // hub.docker.com/user/image is from Docker Hub
143- imageName . split ( '/' ) [ 0 ] === 'docker.io' // hub.docker.com/user/image is from Docker Hub
150+ isDomainDocker ( imageName . split ( '/' ) [ 0 ] )
144151 )
145152 for ( let index = 0 ; index < regs . length ; index ++ ) {
146153 const element = regs [ index ]
147- if ( element . registryDomain === 'registry-1.docker.io' ) {
154+ if ( isDomainDocker ( element . registryDomain ) ) {
148155 return {
149156 serveraddress : element . registryDomain ,
150157 username : element . registryUser ,
0 commit comments