lee/caprover
1
0
Fork 0
mirror of https://github.com/caprover/caprover synced 2026-05-04 02:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expanding the scope of official docker registry auth

Browse Source
This commit is contained in:
Kasra Bigdeli
2021-10-16 12:28:43 -07:00
parent a3b8de20ad
commit a634e494eb
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/user/DockerRegistryHelper.ts
+12 -5
View File
@@ -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,