kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #38991 from tonistiigi/mirrors-validation

Browse source 
daemon: fix mirrors validation
This commit is contained in:
Tibor Vass 2019-04-02 19:52:10 -07:00 • committed by GitHub
commit c12f09bf99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
daemon/daemon.go
View file

@ -11,6 +11,7 @@ import (
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"net" "net"
"net/url"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
@ -159,15 +160,18 @@ func (daemon *Daemon) NewResolveOptionsFunc() resolver.ResolveOptionsFunc {
) )
// must trim "https://" or "http://" prefix // must trim "https://" or "http://" prefix
for i, v := range daemon.configStore.Mirrors { for i, v := range daemon.configStore.Mirrors {
v = strings.TrimPrefix(v, "https://") if uri, err := url.Parse(v); err == nil {
v = strings.TrimPrefix(v, "http://") v = uri.Host
}
mirrors[i] = v mirrors[i] = v
} }
// set "registry-mirrors" // set "registry-mirrors"
m[registryKey] = resolver.RegistryConf{Mirrors: mirrors} m[registryKey] = resolver.RegistryConf{Mirrors: mirrors}
// set "insecure-registries" // set "insecure-registries"
for _, v := range daemon.configStore.InsecureRegistries { for _, v := range daemon.configStore.InsecureRegistries {
v = strings.TrimPrefix(v, "http://") if uri, err := url.Parse(v); err == nil {
v = uri.Host
}
m[v] = resolver.RegistryConf{ m[v] = resolver.RegistryConf{
PlainHTTP: true, PlainHTTP: true,
} }