diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-09-21 10:59:52 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-21 13:04:36 +0000 |
| commit | c4b15ce46b1f49404d5b43b9fd50b14ac7fbee60 (patch) | |
| tree | 48a39ba1b04dd998c9a559f820deb815cea2de5e /cmd/podman | |
| parent | 37b2601a81d4f4941691dcbdd525b4645f448a46 (diff) | |
| download | podman-c4b15ce46b1f49404d5b43b9fd50b14ac7fbee60.tar.gz podman-c4b15ce46b1f49404d5b43b9fd50b14ac7fbee60.tar.bz2 podman-c4b15ce46b1f49404d5b43b9fd50b14ac7fbee60.zip | |
rootless: fix create with images not in the storage
This chunk was mistakenly removed with ecec1a5430885baf96d2e3d6153c7454c41a4617
Introduce it back as it solves the pull of an image that is not yet in
the storage when using create/run.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Closes: #1521
Approved by: baude
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/create.go | 4 | ||||
| -rw-r--r-- | cmd/podman/run.go | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 07e75ad3a..39f6076b9 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -61,6 +61,10 @@ func createCmd(c *cli.Context) error { return err } + if os.Geteuid() != 0 { + rootless.SetSkipStorageSetup(true) + } + runtime, err := libpodruntime.GetContainerRuntime(c) if err != nil { return errors.Wrapf(err, "error creating libpod runtime") diff --git a/cmd/podman/run.go b/cmd/podman/run.go index 2a031de05..ce7d0c40f 100644 --- a/cmd/podman/run.go +++ b/cmd/podman/run.go @@ -10,6 +10,7 @@ import ( "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/rootless" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli" @@ -39,6 +40,9 @@ func runCmd(c *cli.Context) error { if err := createInit(c); err != nil { return err } + if os.Geteuid() != 0 { + rootless.SetSkipStorageSetup(true) + } runtime, err := libpodruntime.GetContainerRuntime(c) if err != nil { |