From c33b359ed196102c44ec0b58491d88a7dedd6294 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 28 Aug 2018 09:14:53 +0200 Subject: rootless, search: do not create a new userns Signed-off-by: Giuseppe Scrivano Closes: #1360 Approved by: vrothberg --- cmd/podman/main.go | 1 + cmd/podman/search.go | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'cmd/podman') 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, -- cgit v1.2.3-54-g00ecf