diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2018-12-03 22:15:06 +0100 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2018-12-06 23:34:59 +0100 |
| commit | b134951d14512506500a1446c3e5600aa858ea61 (patch) | |
| tree | 88be257477d68ff1f9c2f49c4b5f52a250077483 /cmd/podman/search.go | |
| parent | b70f8b3884e42b17748f8d503c84b855aa1eda8d (diff) | |
| download | podman-b134951d14512506500a1446c3e5600aa858ea61.tar.gz podman-b134951d14512506500a1446c3e5600aa858ea61.tar.bz2 podman-b134951d14512506500a1446c3e5600aa858ea61.zip | |
Minimally update for the DockerInsecureSkipTLSVerify type change
Following SystemContext.DockerInsecureSkipTLSVerify, make the
DockerRegistryOne also an OptionalBool, and update callers.
Explicitly document that --tls-verify=true and --tls-verify unset
have different behavior in those commands where the behavior changed
(or where it hasn't changed but the documentation needed updating).
Also make the --tls-verify man page sections a tiny bit more consistent
throughout.
This is a minimal fix, without changing the existing "--tls-verify=true"
paths nor existing manual insecure registry lookups.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'cmd/podman/search.go')
| -rw-r--r-- | cmd/podman/search.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/search.go b/cmd/podman/search.go index fa11dad32..c12224666 100644 --- a/cmd/podman/search.go +++ b/cmd/podman/search.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/containers/image/docker" + "github.com/containers/image/types" "github.com/containers/libpod/cmd/podman/formats" "github.com/containers/libpod/libpod/common" sysreg "github.com/containers/libpod/pkg/registries" @@ -216,7 +217,7 @@ func getSearchOutput(term string, regAndSkipTLS map[string]bool, opts searchOpts var paramsArr []searchParams for reg, skipTLS := range regAndSkipTLS { // set the SkipTLSVerify bool depending on the registry being searched through - sc.DockerInsecureSkipTLSVerify = skipTLS + sc.DockerInsecureSkipTLSVerify = types.NewOptionalBool(skipTLS) results, err := docker.SearchRegistry(context.TODO(), sc, reg, term, limit) if err != nil { logrus.Errorf("error searching registry %q: %v", reg, err) |