diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-04-27 10:36:41 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-04-27 13:13:21 -0400 |
| commit | 02671a103f7991a3c472f90d343a5979f3d3636a (patch) | |
| tree | 4b5c8e29add304c8b3f327db7240703105ab4150 /pkg/domain | |
| parent | ca1c674d2e027b563c3e9fd92c335eb3f5e5e05d (diff) | |
| download | podman-02671a103f7991a3c472f90d343a5979f3d3636a.tar.gz podman-02671a103f7991a3c472f90d343a5979f3d3636a.tar.bz2 podman-02671a103f7991a3c472f90d343a5979f3d3636a.zip | |
Add support for volumes-from, image volumes, init
This should complete Podmanv2's support for volume-related flags.
Most code was sourced from the old pkg/spec implementation with
modifications to account for the split between frontend flags
(volume, mount, tmpfs) and the backend flags implemented here.
Also enables tests for podman run with volumes
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
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 9844d1d96..2a49eb0ca 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -481,7 +481,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 } @@ -669,7 +669,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 } |