diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-14 21:45:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 21:45:58 +0100 |
| commit | 8ec9eb0a7617b6c2db6ed092ab741552dc7cba02 (patch) | |
| tree | 2d1212425257a8d332f4400d0896aa2e465176b0 /pkg/varlinkapi/containers_create.go | |
| parent | dd82acd8ba02be51ec5fea65584e1f7b2036d7c8 (diff) | |
| parent | 52df1fa7e054d577e8416d1d46db1741ad324d4a (diff) | |
| download | podman-8ec9eb0a7617b6c2db6ed092ab741552dc7cba02.tar.gz podman-8ec9eb0a7617b6c2db6ed092ab741552dc7cba02.tar.bz2 podman-8ec9eb0a7617b6c2db6ed092ab741552dc7cba02.zip | |
Merge pull request #2229 from rhatdan/volumes
Fix volume handling in podman
Diffstat (limited to 'pkg/varlinkapi/containers_create.go')
| -rw-r--r-- | pkg/varlinkapi/containers_create.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go index f1835a189..6b53b22c6 100644 --- a/pkg/varlinkapi/containers_create.go +++ b/pkg/varlinkapi/containers_create.go @@ -131,9 +131,14 @@ func varlinkCreateToCreateConfig(ctx context.Context, create iopodman.Create, ru } imageID := data.ID + var ImageVolumes map[string]struct{} + if data != nil && create.Image_volume_type != "ignore" { + ImageVolumes = data.Config.Volumes + } + config := &cc.CreateConfig{ Runtime: runtime, - BuiltinImgVolumes: data.Config.Volumes, + BuiltinImgVolumes: ImageVolumes, ConmonPidFile: create.Conmon_pidfile, ImageVolumeType: create.Image_volume_type, CapAdd: create.Cap_add, |