vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

registry: remove accidentally added --insecure-registry feature

Browse source 
If `--insecure-registry mydomain.com` was specified, it would match a registry at mydomain.com on any port.
This was accidentally added in #9735 and is now being reverted.

Signed-off-by: Tibor Vass <teabee89@gmail.com>
This commit is contained in:
Tibor Vass 2014-12-19 16:40:28 -05:00
parent d1fcbd9028
commit 4170effd5a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/endpoint.go
View file

@ -190,7 +190,7 @@ func isSecure(hostname string, insecureRegistries []string) (bool, error) {
} }
for _, r := range insecureRegistries { for _, r := range insecureRegistries {
if hostname == r || host == r { if hostname == r {
// hostname matches insecure registry // hostname matches insecure registry
return false, nil return false, nil
} }

3
docs/registry_test.go
View file

@ -350,7 +350,8 @@ func TestIsSecure(t *testing.T) {
{"42.42.42.42:5000", []string{"42.1.1.1/8"}, false}, {"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{"42.42.0.0/16"}, true},
{"invalid.domain.com", []string{"invalid.domain.com"}, false}, {"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 { for _, tt := range tests {
// TODO: remove this once we remove localhost insecure by default // TODO: remove this once we remove localhost insecure by default