diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-05-24 13:49:01 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-05-26 14:16:26 -0400 |
| commit | fb163976f4d46bbcbd793bd7a07a2c688d7924b5 (patch) | |
| tree | 782e2a981d65cbad129df62ab541145394e83883 /pkg/specgenutil/specgen.go | |
| parent | 5f097c371f6ea13829b70a0a508464e57027bc8b (diff) | |
| download | podman-fb163976f4d46bbcbd793bd7a07a2c688d7924b5.tar.gz podman-fb163976f4d46bbcbd793bd7a07a2c688d7924b5.tar.bz2 podman-fb163976f4d46bbcbd793bd7a07a2c688d7924b5.zip | |
Support setting image_volume_mode in containers.conf
Fixes: https://github.com/containers/podman/issues/14230
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgenutil/specgen.go')
| -rw-r--r-- | pkg/specgenutil/specgen.go | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index 9cb2f200b..a0100a365 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -229,9 +229,11 @@ func setNamespaces(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions) } func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions, args []string) error { - var ( - err error - ) + rtc, err := config.Default() + if err != nil { + return err + } + // validate flags as needed if err := validate(c); err != nil { return err @@ -479,8 +481,13 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions if len(s.HostUsers) == 0 || len(c.HostUsers) != 0 { s.HostUsers = c.HostUsers } - if len(s.ImageVolumeMode) == 0 || len(c.ImageVolume) != 0 { - s.ImageVolumeMode = c.ImageVolume + if len(c.ImageVolume) != 0 { + if len(s.ImageVolumeMode) == 0 { + s.ImageVolumeMode = c.ImageVolume + } + } + if len(s.ImageVolumeMode) == 0 { + s.ImageVolumeMode = rtc.Engine.ImageVolumeMode } if s.ImageVolumeMode == "bind" { s.ImageVolumeMode = "anonymous" @@ -550,11 +557,6 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions s.CgroupsMode = c.CgroupsMode } if s.CgroupsMode == "" { - rtc, err := config.Default() - if err != nil { - return err - } - s.CgroupsMode = rtc.Cgroups() } |