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

Merge pull request #5195 from CarstonSchilds/master 

re-introduced support for port numbers in docker registry URL
This commit is contained in:
Paweł Gronowski 2024-06-26 13:42:05 +02:00 committed by GitHub
parent ffb842597a 2380481609
commit 94e9aa6891
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

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

@ -74,8 +74,11 @@ 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() != "" {
if u.Port() == "" {
return u.Hostname() return u.Hostname()
} }
return u.Hostname() + ":" + u.Port()
}
} }
hostName, _, _ := strings.Cut(stripped, "/") hostName, _, _ := strings.Cut(stripped, "/")
return hostName return hostName

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