diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-10-22 16:07:26 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-11-30 14:48:26 +0100 |
| commit | 47a8e7c9f9759f1775a0d59dd292eb375accd903 (patch) | |
| tree | b125b7fad9f736445c34f6688f5d4dd28513b1bd /pkg/domain/entities | |
| parent | 67d5b21f66beb58f9bfe25451e812a741d5c017d (diff) | |
| download | podman-47a8e7c9f9759f1775a0d59dd292eb375accd903.tar.gz podman-47a8e7c9f9759f1775a0d59dd292eb375accd903.tar.bz2 podman-47a8e7c9f9759f1775a0d59dd292eb375accd903.zip | |
container create: fix --tls-verify parsing
Make sure that the value is only set if specified on the CLI. c/image
already defaults to true but if set in the system context, we'd skip
settings in the registries.conf.
Backport of commit ff31f2264da.
Fixes: #11933
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/domain/entities')
| -rw-r--r-- | pkg/domain/entities/pods.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index d9dd0c532..8214af19c 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -5,6 +5,7 @@ import ( "strings" "time" + commonFlag "github.com/containers/common/pkg/flag" "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/pkg/specgen" "github.com/containers/podman/v3/pkg/util" @@ -235,7 +236,7 @@ type ContainerCreateOptions struct { Sysctl []string Systemd string Timeout uint - TLSVerify bool + TLSVerify commonFlag.OptionalBool TmpFS []string TTY bool Timezone string |