diff options
| author | cdoern <cdoern@redhat.com> | 2022-06-07 10:43:51 -0400 |
|---|---|---|
| committer | cdoern <cdoern@redhat.com> | 2022-06-07 11:42:16 -0400 |
| commit | ed1e4f94fb35bc727a921c28cea3ba0f94fc9121 (patch) | |
| tree | dcceba8862ee98b0780427b017f2d81bde8fce72 /pkg | |
| parent | 96f9d0dc0e0dbb796494af573c67e194e60aebcd (diff) | |
| download | podman-ed1e4f94fb35bc727a921c28cea3ba0f94fc9121.tar.gz podman-ed1e4f94fb35bc727a921c28cea3ba0f94fc9121.tar.bz2 podman-ed1e4f94fb35bc727a921c28cea3ba0f94fc9121.zip | |
Infra Inheritance patch
infra was overriding options that it should be appending rather than resetting.
fix this by appending the given container's spec to the compatible options before marshaling/unmarshaling
resolves #14454
Signed-off-by: cdoern <cdoern@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 04e24d625..f3093ae33 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -542,6 +542,16 @@ func Inherit(infra libpod.Container, s *specgen.SpecGenerator, rt *libpod.Runtim infraConf := infra.Config() infraSpec := infraConf.Spec + // need to set compatOptions to the currently filled specgenOptions so we do not overwrite + compatibleOptions.CapAdd = append(compatibleOptions.CapAdd, s.CapAdd...) + compatibleOptions.CapDrop = append(compatibleOptions.CapDrop, s.CapDrop...) + compatibleOptions.HostDeviceList = append(compatibleOptions.HostDeviceList, s.HostDeviceList...) + compatibleOptions.ImageVolumes = append(compatibleOptions.ImageVolumes, s.ImageVolumes...) + compatibleOptions.Mounts = append(compatibleOptions.Mounts, s.Mounts...) + compatibleOptions.OverlayVolumes = append(compatibleOptions.OverlayVolumes, s.OverlayVolumes...) + compatibleOptions.SelinuxOpts = append(compatibleOptions.SelinuxOpts, s.SelinuxOpts...) + compatibleOptions.Volumes = append(compatibleOptions.Volumes, s.Volumes...) + compatByte, err := json.Marshal(compatibleOptions) if err != nil { return nil, nil, nil, err |