diff options
| author | baude <bbaude@redhat.com> | 2018-04-16 13:39:00 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-18 14:07:59 +0000 |
| commit | 313e5e83e92f68349d2026fc3f358f237fe93a4a (patch) | |
| tree | 91c523b44bb8f55790037a9a7b42bf63e3c90de6 /libpod/runtime.go | |
| parent | 982927468c6102cfc52e838be4815d2f89d3827e (diff) | |
| download | podman-313e5e83e92f68349d2026fc3f358f237fe93a4a.tar.gz podman-313e5e83e92f68349d2026fc3f358f237fe93a4a.tar.bz2 podman-313e5e83e92f68349d2026fc3f358f237fe93a4a.zip | |
regression: tls verify should be set on registries.conf if insecure
In the case where podman needs to pull an image, if that registry that the image
resides on is known to be insesure (as defined in /etc/containers/registries.conf),
tls-verify should be altered on the fly.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #626
Approved by: mheon
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 94d412c84..168e27c67 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -16,6 +16,7 @@ import ( "github.com/pkg/errors" "github.com/projectatomic/libpod/libpod/image" "github.com/projectatomic/libpod/pkg/hooks" + sysreg "github.com/projectatomic/libpod/pkg/registries" "github.com/sirupsen/logrus" "github.com/ulule/deepcopier" ) @@ -549,7 +550,7 @@ func (r *Runtime) Info() ([]InfoData, error) { } info = append(info, InfoData{Type: "store", Data: storeInfo}) - reg, err := GetRegistries() + reg, err := sysreg.GetRegistries() if err != nil { return nil, errors.Wrapf(err, "error getting registries") } @@ -557,7 +558,7 @@ func (r *Runtime) Info() ([]InfoData, error) { registries["registries"] = reg info = append(info, InfoData{Type: "registries", Data: registries}) - i, err := GetInsecureRegistries() + i, err := sysreg.GetInsecureRegistries() if err != nil { return nil, errors.Wrapf(err, "error getting registries") } |