summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-08-28 09:14:53 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-28 11:25:01 +0000
commitc33b359ed196102c44ec0b58491d88a7dedd6294 (patch)
tree3e5b9f34613121b310cfa0bb44cd53a463da355f /cmd/podman
parentec07b2d0216c316ac7b2e0869a4e8af02859509d (diff)
downloadpodman-c33b359ed196102c44ec0b58491d88a7dedd6294.tar.gz
podman-c33b359ed196102c44ec0b58491d88a7dedd6294.tar.bz2
podman-c33b359ed196102c44ec0b58491d88a7dedd6294.zip
rootless, search: do not create a new userns
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #1360 Approved by: vrothberg
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/main.go1
-rw-r--r--cmd/podman/search.go7
2 files changed, 1 insertions, 7 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 1fdd5c939..bd1cc8b95 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -32,6 +32,7 @@ var cmdsNotRequiringRootless = map[string]bool{
"login": true,
"logout": true,
"kill": true,
+ "search": true,
"stop": true,
}
diff --git a/cmd/podman/search.go b/cmd/podman/search.go
index cc18cd1de..2e68e8c21 100644
--- a/cmd/podman/search.go
+++ b/cmd/podman/search.go
@@ -8,7 +8,6 @@ import (
"github.com/containers/image/docker"
"github.com/containers/libpod/cmd/podman/formats"
- "github.com/containers/libpod/cmd/podman/libpodruntime"
"github.com/containers/libpod/libpod/common"
sysreg "github.com/containers/libpod/pkg/registries"
"github.com/docker/distribution/reference"
@@ -108,12 +107,6 @@ func searchCmd(c *cli.Context) error {
return err
}
- runtime, err := libpodruntime.GetRuntime(c)
- if err != nil {
- return errors.Wrapf(err, "could not get runtime")
- }
- defer runtime.Shutdown(false)
-
format := genSearchFormat(c.String("format"))
opts := searchOpts{
format: format,