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 /cmd/podman | |
| 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 'cmd/podman')
| -rw-r--r-- | cmd/podman/common/specgen.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index c98377a69..5d5816ea4 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -409,13 +409,11 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string s.StaticMAC = c.Net.StaticMAC s.UseImageHosts = c.Net.NoHosts - // deferred, must be added on libpod side - //var ImageVolumes map[string]struct{} - //if data != nil && c.String("image-volume") != "ignore" { - // ImageVolumes = data.Config.Volumes - //} - s.ImageVolumeMode = c.ImageVolume + if s.ImageVolumeMode == "bind" { + s.ImageVolumeMode = "anonymous" + } + systemd := c.SystemdD == "always" if !systemd && command != nil { x, err := strconv.ParseBool(c.SystemdD) |