diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-07 13:02:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-07 13:02:02 -0400 |
| commit | ce93ab354234c989c52bdbf87166e117e7c97fce (patch) | |
| tree | 5cd6445f92921c7015fbe0b9663983165bd58db3 /cmd | |
| parent | a7500e54a4646c7db477349e2530ac13df77b8fa (diff) | |
| parent | ccc5bc167fa2c140e33963bb5cce99f40ff00281 (diff) | |
| download | podman-ce93ab354234c989c52bdbf87166e117e7c97fce.tar.gz podman-ce93ab354234c989c52bdbf87166e117e7c97fce.tar.bz2 podman-ce93ab354234c989c52bdbf87166e117e7c97fce.zip | |
Merge pull request #7845 from rhatdan/remote
Attempt to turn on some more remote tests
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common/create.go | 10 | ||||
| -rw-r--r-- | cmd/podman/containers/create.go | 1 | ||||
| -rw-r--r-- | cmd/podman/containers/run.go | 1 | ||||
| -rw-r--r-- | cmd/podman/images/search.go | 5 |
4 files changed, 6 insertions, 11 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index bb5eb9f38..0ec422313 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -166,10 +166,12 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "env", "e", containerConfig.Env(), "Set environment variables in container", ) - createFlags.BoolVar( - &cf.EnvHost, - "env-host", false, "Use all current host environment variables in container", - ) + if !registry.IsRemote() { + createFlags.BoolVar( + &cf.EnvHost, + "env-host", false, "Use all current host environment variables in container", + ) + } createFlags.StringSliceVar( &cf.EnvFile, "env-file", []string{}, diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index d75352848..809162e76 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -64,7 +64,6 @@ func createFlags(flags *pflag.FlagSet) { _ = flags.MarkHidden("signature-policy") if registry.IsRemote() { _ = flags.MarkHidden("authfile") - _ = flags.MarkHidden("env-host") _ = flags.MarkHidden("http-proxy") } } diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index 8052b033e..19c984bbf 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -67,7 +67,6 @@ func runFlags(flags *pflag.FlagSet) { _ = flags.MarkHidden("signature-policy") if registry.IsRemote() { _ = flags.MarkHidden("authfile") - _ = flags.MarkHidden("env-host") _ = flags.MarkHidden("http-proxy") _ = flags.MarkHidden("preserve-fds") } diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index c7f16a838..b8d989d65 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -86,11 +86,6 @@ func searchFlags(flags *pflag.FlagSet) { flags.BoolVar(&searchOptions.NoTrunc, "no-trunc", false, "Do not truncate the output") flags.StringVar(&searchOptions.Authfile, "authfile", auth.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") flags.BoolVar(&searchOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries") - - if registry.IsRemote() { - _ = flags.MarkHidden("authfile") - _ = flags.MarkHidden("tls-verify") - } } // imageSearch implements the command for searching images. |