diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-22 15:38:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 15:38:42 +0200 |
| commit | 80add2902cf3561d2c9f91dc045076519cd297d5 (patch) | |
| tree | 2c9b51e5b32158c96142bef6168114380bf4260a /pkg/specgen/container_validate.go | |
| parent | 9f5d1462be20c86afe363750ecc20ee89e0b3978 (diff) | |
| parent | 4c4a00f63ea5bc7956bf40be457bf86643575dce (diff) | |
| download | podman-80add2902cf3561d2c9f91dc045076519cd297d5.tar.gz podman-80add2902cf3561d2c9f91dc045076519cd297d5.tar.bz2 podman-80add2902cf3561d2c9f91dc045076519cd297d5.zip | |
Merge pull request #6992 from rhatdan/apparmor
Support default profile for apparmor
Diffstat (limited to 'pkg/specgen/container_validate.go')
| -rw-r--r-- | pkg/specgen/container_validate.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index 622313a04..eddc4ad5d 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -81,10 +81,6 @@ func (s *SpecGenerator) Validate() error { if len(s.CapAdd) > 0 && s.Privileged { return exclusiveOptions("CapAdd", "privileged") } - // apparmor and privileged are exclusive - if len(s.ApparmorProfile) > 0 && s.Privileged { - return exclusiveOptions("AppArmorProfile", "privileged") - } // userns and idmappings conflict if s.UserNS.IsPrivate() && s.IDMappings == nil { return errors.Wrap(ErrInvalidSpecConfig, "IDMappings are required when not creating a User namespace") |