diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-19 21:16:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 21:16:06 +0200 |
| commit | 890378e3f7fe93bd40322445e31c169fa03d8bf7 (patch) | |
| tree | 3ca16c20e44dd94d6716e903a493e04a9b3fcdb6 /libpod/oci_linux.go | |
| parent | 33906a4c4013bfe12f058526ad0e3b697d2ec033 (diff) | |
| parent | d27e71374e89b3c88b486f8a7015185c9fe13ea9 (diff) | |
| download | podman-890378e3f7fe93bd40322445e31c169fa03d8bf7.tar.gz podman-890378e3f7fe93bd40322445e31c169fa03d8bf7.tar.bz2 podman-890378e3f7fe93bd40322445e31c169fa03d8bf7.zip | |
Merge pull request #3760 from rhatdan/auth
Use GetRuntimeDir to setup auth.json for login
Diffstat (limited to 'libpod/oci_linux.go')
| -rw-r--r-- | libpod/oci_linux.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go index 45365203e..1613c3e68 100644 --- a/libpod/oci_linux.go +++ b/libpod/oci_linux.go @@ -208,7 +208,7 @@ func (r *OCIRuntime) execContainer(c *Container, cmd, capAdd, env []string, tty } }() - runtimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return -1, nil, err } @@ -437,7 +437,7 @@ func (r *OCIRuntime) stopContainer(ctr *Container, timeout uint) error { args = []string{"kill", "--all", ctr.ID(), "KILL"} } - runtimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return err } @@ -487,7 +487,7 @@ func (r *OCIRuntime) execStopContainer(ctr *Container, timeout uint) error { if len(execSessions) == 0 { return nil } - runtimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return err } |