diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-28 00:49:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 00:49:28 +0200 |
| commit | 0ebf0bc56091d305ac064c59e20289d47bf56437 (patch) | |
| tree | 793fdad75f83359305ea406f735f446a3253d5df /pkg/specgen/container_validate.go | |
| parent | 463c0b9f2d16c157e7047a2c689ff432bd0dc6ca (diff) | |
| parent | 446c35efdf4f7141ec32a347385587d7b4fc2c75 (diff) | |
| download | podman-0ebf0bc56091d305ac064c59e20289d47bf56437.tar.gz podman-0ebf0bc56091d305ac064c59e20289d47bf56437.tar.bz2 podman-0ebf0bc56091d305ac064c59e20289d47bf56437.zip | |
Merge pull request #13611 from rvandernoort/vendor_filters
Vendor c/common for filters
Diffstat (limited to 'pkg/specgen/container_validate.go')
| -rw-r--r-- | pkg/specgen/container_validate.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index a279b8a62..e71eafb75 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -76,8 +76,8 @@ func (s *SpecGenerator) Validate() error { s.ContainerStorageConfig.ImageVolumeMode, strings.Join(ImageVolumeModeValues, ",")) } // shmsize conflicts with IPC namespace - if s.ContainerStorageConfig.ShmSize != nil && !s.ContainerStorageConfig.IpcNS.IsPrivate() { - return errors.New("cannot set shmsize when running in the host IPC Namespace") + if s.ContainerStorageConfig.ShmSize != nil && (s.ContainerStorageConfig.IpcNS.IsHost() || s.ContainerStorageConfig.IpcNS.IsNone()) { + return errors.Errorf("cannot set shmsize when running in the %s IPC Namespace", s.ContainerStorageConfig.IpcNS) } // @@ -166,7 +166,7 @@ func (s *SpecGenerator) Validate() error { if err := s.UtsNS.validate(); err != nil { return err } - if err := s.IpcNS.validate(); err != nil { + if err := validateIPCNS(&s.IpcNS); err != nil { return err } if err := s.PidNS.validate(); err != nil { |