diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-27 21:53:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 21:53:37 +0200 |
| commit | f6f71724949c22cf89a44015c29bd5a144db7390 (patch) | |
| tree | 937537403d515fe2fcb1df9aebc17600347898a0 /pkg/domain | |
| parent | 8642e256f2036f4263b9817322cde7eec8b0915c (diff) | |
| parent | 67ec4e1d272d20610f885f91cc322edf57a13f45 (diff) | |
| download | podman-f6f71724949c22cf89a44015c29bd5a144db7390.tar.gz podman-f6f71724949c22cf89a44015c29bd5a144db7390.tar.bz2 podman-f6f71724949c22cf89a44015c29bd5a144db7390.zip | |
Merge pull request #6000 from mheon/volume_backend_flags
Add support for volumes-from, image volumes, init
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index e09891760..286d37c34 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -492,7 +492,7 @@ func (ic *ContainerEngine) ContainerCreate(ctx context.Context, s *specgen.SpecG if err := generate.CompleteSpec(ctx, ic.Libpod, s); err != nil { return nil, err } - ctr, err := generate.MakeContainer(ic.Libpod, s) + ctr, err := generate.MakeContainer(ctx, ic.Libpod, s) if err != nil { return nil, err } @@ -680,7 +680,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta if err := generate.CompleteSpec(ctx, ic.Libpod, opts.Spec); err != nil { return nil, err } - ctr, err := generate.MakeContainer(ic.Libpod, opts.Spec) + ctr, err := generate.MakeContainer(ctx, ic.Libpod, opts.Spec) if err != nil { return nil, err } |