diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-10 03:34:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 03:34:54 -0800 |
| commit | 64627d910b2113fa2de6b949d846af379e75e305 (patch) | |
| tree | d555591919d240a25827eb3737446260c04496e0 /pkg/apparmor/apparmor.go | |
| parent | 0f6535cf6b4bfac265983c2fdd3482310ab4f39b (diff) | |
| parent | edb285d17675061832aceaf72021b87aba149438 (diff) | |
| download | podman-64627d910b2113fa2de6b949d846af379e75e305.tar.gz podman-64627d910b2113fa2de6b949d846af379e75e305.tar.bz2 podman-64627d910b2113fa2de6b949d846af379e75e305.zip | |
Merge pull request #2114 from vrothberg/issue-2107
apparmor: apply default profile at container initialization
Diffstat (limited to 'pkg/apparmor/apparmor.go')
| -rw-r--r-- | pkg/apparmor/apparmor.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/apparmor/apparmor.go b/pkg/apparmor/apparmor.go index 8b9f99477..45c029c07 100644 --- a/pkg/apparmor/apparmor.go +++ b/pkg/apparmor/apparmor.go @@ -2,11 +2,16 @@ package apparmor import ( "errors" + libpodVersion "github.com/containers/libpod/version" ) var ( + // DefaultLipodProfilePrefix is used for version-independent presence checks. + DefaultLipodProfilePrefix = "libpod-default" + "-" // DefaultLibpodProfile is the name of default libpod AppArmor profile. - DefaultLibpodProfile = "libpod-default" + DefaultLibpodProfile = DefaultLipodProfilePrefix + libpodVersion.Version // ErrApparmorUnsupported indicates that AppArmor support is not supported. ErrApparmorUnsupported = errors.New("AppArmor is not supported") + // ErrApparmorRootless indicates that AppArmor support is not supported in rootless mode. + ErrApparmorRootless = errors.New("AppArmor is not supported in rootless mode") ) |