diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-15 16:38:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 16:38:52 +0200 |
| commit | 37ed662f323ef4700ae14d441fb2264a59960baa (patch) | |
| tree | f69f267eb26f166d6347e7c3bba0579c274dbba3 /pkg/domain/infra | |
| parent | a756161e80cd32b705bb0dfe3ec4753f883ec929 (diff) | |
| parent | 714718794236245e81d4552f30731157d731aa9d (diff) | |
| download | podman-37ed662f323ef4700ae14d441fb2264a59960baa.tar.gz podman-37ed662f323ef4700ae14d441fb2264a59960baa.tar.bz2 podman-37ed662f323ef4700ae14d441fb2264a59960baa.zip | |
Merge pull request #5814 from baude/v2specgenprunelibpod
v2specgen prune libpod
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/pods.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index c3e5d59bc..bb637de3e 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -5,13 +5,13 @@ package abi import ( "context" - lpfilters "github.com/containers/libpod/libpod/filters" - "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/define" + lpfilters "github.com/containers/libpod/libpod/filters" "github.com/containers/libpod/pkg/domain/entities" "github.com/containers/libpod/pkg/signal" "github.com/containers/libpod/pkg/specgen" + "github.com/containers/libpod/pkg/specgen/generate" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -246,7 +246,7 @@ func (ic *ContainerEngine) PodRm(ctx context.Context, namesOrIds []string, optio func (ic *ContainerEngine) PodCreate(ctx context.Context, opts entities.PodCreateOptions) (*entities.PodCreateReport, error) { podSpec := specgen.NewPodSpecGenerator() opts.ToPodSpecGen(podSpec) - pod, err := podSpec.MakePod(ic.Libpod) + pod, err := generate.MakePod(podSpec, ic.Libpod) if err != nil { return nil, err } |