зеркало из https://github.com/microsoft/docker.git
Merge pull request #9754 from tiborvass/remove-insecure-registry-all-ports
registry: remove accidentally added --insecure-registry feature
This commit is contained in:
Коммит
ed49db8984
|
@ -190,7 +190,7 @@ func isSecure(hostname string, insecureRegistries []string) (bool, error) {
|
|||
}
|
||||
|
||||
for _, r := range insecureRegistries {
|
||||
if hostname == r || host == r {
|
||||
if hostname == r {
|
||||
// hostname matches insecure registry
|
||||
return false, nil
|
||||
}
|
||||
|
|
|
@ -350,7 +350,8 @@ func TestIsSecure(t *testing.T) {
|
|||
{"42.42.42.42:5000", []string{"42.1.1.1/8"}, false},
|
||||
{"invalid.domain.com", []string{"42.42.0.0/16"}, true},
|
||||
{"invalid.domain.com", []string{"invalid.domain.com"}, false},
|
||||
{"invalid.domain.com:5000", []string{"invalid.domain.com"}, false},
|
||||
{"invalid.domain.com:5000", []string{"invalid.domain.com"}, true},
|
||||
{"invalid.domain.com:5000", []string{"invalid.domain.com:5000"}, false},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
// TODO: remove this once we remove localhost insecure by default
|
||||
|
|
Загрузка…
Ссылка в новой задаче