From a634e494eb571edb7d8a68cf06f32aceee56a144 Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Sat, 16 Oct 2021 12:28:43 -0700 Subject: [PATCH] Expanding the scope of official docker registry auth --- src/user/DockerRegistryHelper.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/user/DockerRegistryHelper.ts b/src/user/DockerRegistryHelper.ts index 1f95947..76b3e68 100644 --- a/src/user/DockerRegistryHelper.ts +++ b/src/user/DockerRegistryHelper.ts @@ -133,18 +133,25 @@ class DockerRegistryHelper { } } + function isDomainDocker(domainToTest: string) { + return ( + domainToTest.endsWith('.docker.io') || // *.docker.io/user/image is from Docker Hub + domainToTest.endsWith('.docker.com') || // *.docker.com/user/image is from Docker Hub + domainToTest === 'docker.com' || // docker.com/user/image is from Docker Hub + domainToTest === 'docker.io' // docker.io/user/image is from Docker Hub + ) + } + // if none of the registries explicitly relates to the image name, and no other explicit domain is defined, // try Docker Hub registry as the default if ( + imageName.split('/').length == 1 || // image is from Docker Hub imageName.split('/').length == 2 || // user/image is from Docker Hub - imageName.split('/')[0].endsWith('.docker.io') || // registry-1.docker.io/user/image is from Docker Hub - imageName.split('/')[0] === 'docker.io' || // registry-1.docker.io/user/image is from Docker Hub - imageName.split('/')[0].endsWith('.docker.com') || // hub.docker.com/user/image is from Docker Hub - imageName.split('/')[0] === 'docker.io' // hub.docker.com/user/image is from Docker Hub + isDomainDocker(imageName.split('/')[0]) ) for (let index = 0; index < regs.length; index++) { const element = regs[index] - if (element.registryDomain === 'registry-1.docker.io') { + if (isDomainDocker(element.registryDomain)) { return { serveraddress: element.registryDomain, username: element.registryUser,