From 0a9af7c99b61344920b6c8ff79103587bc8fbd60 Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Mon, 16 Aug 2021 16:59:20 -0700 Subject: [PATCH] Fixed dockerhub authentication --- src/user/DockerRegistryHelper.ts | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/user/DockerRegistryHelper.ts b/src/user/DockerRegistryHelper.ts index 322850d..db197fb 100644 --- a/src/user/DockerRegistryHelper.ts +++ b/src/user/DockerRegistryHelper.ts @@ -133,18 +133,26 @@ class DockerRegistryHelper { } } - // if none of the registries explicitly relates to the image name, try the official one - for (let index = 0; index < regs.length; index++) { - const element = regs[index] - if (element.registryDomain === 'registry-1.docker.io') { - return { - serveraddress: element.registryDomain, - username: element.registryUser, - password: element.registryPassword, - // email: CaptainConstants.defaultEmail, // email is optional + // 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 == 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 + ) + for (let index = 0; index < regs.length; index++) { + const element = regs[index] + if (element.registryDomain === 'registry-1.docker.io') { + return { + serveraddress: element.registryDomain, + username: element.registryUser, + password: element.registryPassword, + // email: CaptainConstants.defaultEmail, // email is optional + } } } - } return undefined })