diff options
author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-05 13:52:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-05 13:52:15 +0000 |
commit | 1f0a24437d71f8fe2b2233a428202afcfe513666 (patch) | |
tree | e17f57dce6bf61d38a74fc6b8f011bffbb4082fa /pkg/domain/infra | |
parent | 117583c293713f2baa920c4035e820ad59fe6622 (diff) | |
parent | 3c3fa6fac4d0f8e89181ea2d4e1fe0318d24b6f4 (diff) | |
download | podman-1f0a24437d71f8fe2b2233a428202afcfe513666.tar.gz podman-1f0a24437d71f8fe2b2233a428202afcfe513666.tar.bz2 podman-1f0a24437d71f8fe2b2233a428202afcfe513666.zip |
Merge pull request #11011 from baude/initcontainers
implement init containers in podman
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r-- | pkg/domain/infra/abi/pods.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index 9f033a4c0..055c495d5 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -250,7 +250,9 @@ func (ic *ContainerEngine) prunePodHelper(ctx context.Context) ([]*entities.PodP func (ic *ContainerEngine) PodCreate(ctx context.Context, opts entities.PodCreateOptions) (*entities.PodCreateReport, error) { podSpec := specgen.NewPodSpecGenerator() - opts.ToPodSpecGen(podSpec) + if err := opts.ToPodSpecGen(podSpec); err != nil { + return nil, err + } pod, err := generate.MakePod(podSpec, ic.Libpod) if err != nil { return nil, err |