diff options
author | Jhon Honce <jhonce@redhat.com> | 2020-06-04 11:51:29 -0700 |
---|---|---|
committer | Jhon Honce <jhonce@redhat.com> | 2020-06-23 08:18:53 -0700 |
commit | 7377e578a9402a416579be92cee44c3b3786f81a (patch) | |
tree | c1424a43cc606ed11c8b0b5fb5f9f199ab0d83c5 /cmd/podman/registry | |
parent | b2c42a0993d2129c910036d4054ec25129d09f18 (diff) | |
download | podman-7377e578a9402a416579be92cee44c3b3786f81a.tar.gz podman-7377e578a9402a416579be92cee44c3b3786f81a.tar.bz2 podman-7377e578a9402a416579be92cee44c3b3786f81a.zip |
V2 podman system connection
* Implement command
* Refactor podman-remote to pull from containers.conf by default
* podman-remote defaults to --remote being true
* Write podman-system-connection.1.md
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/registry')
-rw-r--r-- | cmd/podman/registry/config.go | 3 | ||||
-rw-r--r-- | cmd/podman/registry/config_tunnel.go | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index 49d5bca74..a67568d73 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -68,7 +68,6 @@ func newPodmanConfig() { } } - // FIXME: for rootless, add flag to get the path to override configuration cfg, err := config.NewConfig("") if err != nil { fmt.Fprint(os.Stderr, "Failed to obtain podman configuration: "+err.Error()) @@ -83,7 +82,7 @@ func newPodmanConfig() { podmanOptions = entities.PodmanConfig{Config: cfg, EngineMode: mode} } -// SetXdgDirs ensures the XDG_RUNTIME_DIR env and XDG_CONFIG_HOME variables are set. +// setXdgDirs ensures the XDG_RUNTIME_DIR env and XDG_CONFIG_HOME variables are set. // containers/image uses XDG_RUNTIME_DIR to locate the auth file, XDG_CONFIG_HOME is // use for the libpod.conf configuration file. func setXdgDirs() error { diff --git a/cmd/podman/registry/config_tunnel.go b/cmd/podman/registry/config_tunnel.go index bb3da947e..4f9f51163 100644 --- a/cmd/podman/registry/config_tunnel.go +++ b/cmd/podman/registry/config_tunnel.go @@ -2,6 +2,13 @@ package registry +import ( + "os" +) + func init() { abiSupport = false + + // Enforce that podman-remote == podman --remote + os.Args = append(os.Args, "--remote") } |