diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-15 15:00:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-15 15:00:13 -0700 |
commit | c7d17613ec7635413c035e0ed0b8700c56430303 (patch) | |
tree | 2eba4ffc3a0e42b15f28f1e98a12a33c14a224f2 /pkg/api/handlers/utils/containers.go | |
parent | 0f7162d791076e736a7cee3a45051925fa4d0589 (diff) | |
parent | 30d2964ff83387e3c3fa7447776c57f4342707e6 (diff) | |
download | podman-c7d17613ec7635413c035e0ed0b8700c56430303.tar.gz podman-c7d17613ec7635413c035e0ed0b8700c56430303.tar.bz2 podman-c7d17613ec7635413c035e0ed0b8700c56430303.zip |
Merge pull request #5827 from baude/v2bloat
v2 bloat pruning phase 2
Diffstat (limited to 'pkg/api/handlers/utils/containers.go')
-rw-r--r-- | pkg/api/handlers/utils/containers.go | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go index bbe4cee3c..d1107f67c 100644 --- a/pkg/api/handlers/utils/containers.go +++ b/pkg/api/handlers/utils/containers.go @@ -6,9 +6,10 @@ import ( "time" "github.com/containers/libpod/cmd/podman/shared" + createconfig "github.com/containers/libpod/pkg/spec" + "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/define" - createconfig "github.com/containers/libpod/pkg/spec" "github.com/gorilla/schema" "github.com/pkg/errors" ) @@ -68,24 +69,6 @@ func WaitContainer(w http.ResponseWriter, r *http.Request) (int32, error) { return con.WaitForConditionWithInterval(interval, condition) } -// GenerateFilterFuncsFromMap is used to generate un-executed functions that can be used to filter -// containers. It is specifically designed for the RESTFUL API input. -func GenerateFilterFuncsFromMap(r *libpod.Runtime, filters map[string][]string) ([]libpod.ContainerFilter, error) { - var ( - filterFuncs []libpod.ContainerFilter - ) - for k, v := range filters { - for _, val := range v { - f, err := shared.GenerateContainerFilterFuncs(k, val, r) - if err != nil { - return filterFuncs, err - } - filterFuncs = append(filterFuncs, f) - } - } - return filterFuncs, nil -} - func CreateContainer(ctx context.Context, w http.ResponseWriter, runtime *libpod.Runtime, cc *createconfig.CreateConfig) { var pod *libpod.Pod ctr, err := shared.CreateContainerFromCreateConfig(runtime, cc, ctx, pod) |