Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5197 from thaJeztah/27.0_backport_fix_custom_ports 

[27.0 backport] re-introduced support for port numbers in docker registry URL
This commit is contained in:
Sebastiaan van Stijn 2024-06-26 15:04:51 +02:00 committed by GitHub
parent fce24d5f8d 217971d481
commit 37533c2f55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/config/credentials/file_store.go
View File

@ -74,7 +74,10 @@ func ConvertToHostname(maybeURL string) string {
if strings.Contains(stripped, "://") { if strings.Contains(stripped, "://") {
u, err := url.Parse(stripped) u, err := url.Parse(stripped)
if err == nil && u.Hostname() != "" { if err == nil && u.Hostname() != "" {
return u.Hostname() if u.Port() == "" {
return u.Hostname()
}
return u.Hostname() + ":" + u.Port()
} }
} }
hostName, _, _ := strings.Cut(stripped, "/") hostName, _, _ := strings.Cut(stripped, "/")

17
cli/config/credentials/file_store_test.go
View File

@ -167,6 +167,23 @@ func TestConvertToHostname(t *testing.T) {
input: "ftp://example.com", input: "ftp://example.com",
expected: "example.com", expected: "example.com",
}, },
// should support non-standard port in registry url
{
input: "example.com:6555",
expected: "example.com:6555",
},
{
input: "http://example.com:6555",
expected: "example.com:6555",
},
{
input: "https://example.com:6555",
expected: "example.com:6555",
},
{
input: "https://example.com:6555/v2/",
expected: "example.com:6555",
},
} }
for _, tc := range tests { for _, tc := range tests {
tc := tc tc := tc