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.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.go')
| -rw-r--r-- | libpod/oci.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 4ba3114e3..8a873ca5b 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -213,7 +213,7 @@ func bindPorts(ports []ocicni.PortMapping) ([]*os.File, error) { func (r *OCIRuntime) updateContainerStatus(ctr *Container, useRuntime bool) error { exitFile := ctr.exitFilePath() - runtimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return err } @@ -336,7 +336,7 @@ func (r *OCIRuntime) updateContainerStatus(ctr *Container, useRuntime bool) erro // Sets time the container was started, but does not save it. func (r *OCIRuntime) startContainer(ctr *Container) error { // TODO: streams should probably *not* be our STDIN/OUT/ERR - redirect to buffers? - runtimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return err } @@ -356,7 +356,7 @@ func (r *OCIRuntime) startContainer(ctr *Container) error { // killContainer sends the given signal to the given container func (r *OCIRuntime) killContainer(ctr *Container, signal uint) error { logrus.Debugf("Sending signal %d to container %s", signal, ctr.ID()) - runtimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return err } @@ -370,7 +370,7 @@ func (r *OCIRuntime) killContainer(ctr *Container, signal uint) error { // deleteContainer deletes a container from the OCI runtime func (r *OCIRuntime) deleteContainer(ctr *Container) error { - runtimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return err } @@ -380,7 +380,7 @@ func (r *OCIRuntime) deleteContainer(ctr *Container) error { // pauseContainer pauses the given container func (r *OCIRuntime) pauseContainer(ctr *Container) error { - runtimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return err } @@ -390,7 +390,7 @@ func (r *OCIRuntime) pauseContainer(ctr *Container) error { // unpauseContainer unpauses the given container func (r *OCIRuntime) unpauseContainer(ctr *Container) error { - runtimeDir, err := util.GetRootlessRuntimeDir() + runtimeDir, err := util.GetRuntimeDir() if err != nil { return err } |