diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-06 15:28:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 15:28:28 -0800 |
| commit | a387c723a90a787a1d35c4a9b3b54347d5c08436 (patch) | |
| tree | 7b4ce94ae629d4800c2fc694aafa530003101375 /libpod/image/docker_registry_options.go | |
| parent | 71497706e124eaae0f4654278749c1e34a6c209f (diff) | |
| parent | 489164fcfa3d897ab9f341249a7873bfd3c7d99e (diff) | |
| download | podman-a387c723a90a787a1d35c4a9b3b54347d5c08436.tar.gz podman-a387c723a90a787a1d35c4a9b3b54347d5c08436.tar.bz2 podman-a387c723a90a787a1d35c4a9b3b54347d5c08436.zip | |
Merge pull request #1930 from mtrmac/sysregistriesv2
Update c/image for sysregistriesv2 changes and automatic docker:// insecure configuration
Diffstat (limited to 'libpod/image/docker_registry_options.go')
| -rw-r--r-- | libpod/image/docker_registry_options.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go index 97a151396..c191a3ca2 100644 --- a/libpod/image/docker_registry_options.go +++ b/libpod/image/docker_registry_options.go @@ -19,8 +19,9 @@ type DockerRegistryOptions struct { // except for ".cert" and ".key" suffixes). DockerCertPath string // DockerInsecureSkipTLSVerify turns off verification of TLS - // certificates and allows connecting to registries without encryption. - DockerInsecureSkipTLSVerify bool + // certificates and allows connecting to registries without encryption + // - or forces it on even if registries.conf has the registry configured as insecure. + DockerInsecureSkipTLSVerify types.OptionalBool } // GetSystemContext constructs a new system context from a parent context. the values in the DockerRegistryOptions, and other parameters. |