summaryrefslogtreecommitdiff
path: root/cmd/podman/registry/remote.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-10-15 11:33:30 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-10-15 14:40:02 -0400
commit468e7c689b718229ed062b3daae9373f7459b6e2 (patch)
tree49b7f0c94eaf360c1612befff2f5cd5fd6b5c92f /cmd/podman/registry/remote.go
parent171f7b8975194ff9f47a3dd23adec81d11e6d104 (diff)
downloadpodman-468e7c689b718229ed062b3daae9373f7459b6e2.tar.gz
podman-468e7c689b718229ed062b3daae9373f7459b6e2.tar.bz2
podman-468e7c689b718229ed062b3daae9373f7459b6e2.zip
Move CONTAINER_HOST and _CONNECTION to IsRemote Function
Current code does not check early enough. Follow up to https://github.com/containers/podman/pull/11978 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/registry/remote.go')
-rw-r--r--cmd/podman/registry/remote.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go
index b5da98bd4..c78930574 100644
--- a/cmd/podman/registry/remote.go
+++ b/cmd/podman/registry/remote.go
@@ -19,11 +19,17 @@ var remoteFromCLI = struct {
// Use in init() functions as an initialization check
func IsRemote() bool {
remoteFromCLI.sync.Do(func() {
+ remote := false
+ if _, ok := os.LookupEnv("CONTAINER_HOST"); ok {
+ remote = true
+ } else if _, ok := os.LookupEnv("CONTAINER_CONNECTION"); ok {
+ remote = true
+ }
fs := pflag.NewFlagSet("remote", pflag.ContinueOnError)
fs.ParseErrorsWhitelist.UnknownFlags = true
fs.Usage = func() {}
fs.SetInterspersed(false)
- fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", false, "")
+ fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", remote, "")
// The shell completion logic will call a command called "__complete" or "__completeNoDesc"
// This command will always be the second argument