summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-27 04:22:21 -0800
committerGitHub <noreply@github.com>2020-01-27 04:22:21 -0800
commit2d9d5e7606ac5d10abaa87a2cddcd1d50021ad0f (patch)
treea0d84cdbbfee1f75d6b82dadf351bd8f5f6c6aa4
parentc28af15932d0d184f841e9d30103730c902c9ba7 (diff)
parent7f69669a3ad1657c59b66d68cba8ace422b4da16 (diff)
downloadpodman-2d9d5e7606ac5d10abaa87a2cddcd1d50021ad0f.tar.gz
podman-2d9d5e7606ac5d10abaa87a2cddcd1d50021ad0f.tar.bz2
podman-2d9d5e7606ac5d10abaa87a2cddcd1d50021ad0f.zip
Merge pull request #4985 from baude/pushhidden
Hidden remote flags can be nil
-rw-r--r--cmd/podman/push.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/push.go b/cmd/podman/push.go
index 1be8dfe11..b078959ba 100644
--- a/cmd/podman/push.go
+++ b/cmd/podman/push.go
@@ -100,7 +100,8 @@ func pushCmd(c *cliconfig.PushValues) error {
// --compress and --format can only be used for the "dir" transport
splitArg := strings.SplitN(destName, ":", 2)
- if c.Flag("compress").Changed || c.Flag("format").Changed {
+
+ if c.IsSet("compress") || c.Flag("format").Changed {
if splitArg[0] != directory.Transport.Name() {
return errors.Errorf("--compress and --format can be set only when pushing to a directory using the 'dir' transport")
}
@@ -141,7 +142,7 @@ func pushCmd(c *cliconfig.PushValues) error {
DockerRegistryCreds: registryCreds,
DockerCertPath: certPath,
}
- if c.Flag("tls-verify").Changed {
+ if c.IsSet("tls-verify") {
dockerRegistryOptions.DockerInsecureSkipTLSVerify = types.NewOptionalBool(!c.TlsVerify)
}