diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-07-15 16:33:24 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-07-22 13:14:15 -0400 |
| commit | cb603b8a3e4a4a1da194ed020caf270fa85f6f5b (patch) | |
| tree | 10631dc3d3a556ad1f9d30481764f69216d9b4ce /contrib | |
| parent | 2d24487ba244e5cd900f6aecc5d8896e1354d1ee (diff) | |
| download | podman-cb603b8a3e4a4a1da194ed020caf270fa85f6f5b.tar.gz podman-cb603b8a3e4a4a1da194ed020caf270fa85f6f5b.tar.bz2 podman-cb603b8a3e4a4a1da194ed020caf270fa85f6f5b.zip | |
Support default profile for apparmor
Currently you can not apply an ApparmorProfile if you specify
--privileged. This patch will allow both to be specified
simultaniosly.
By default Apparmor should be disabled if the user
specifies --privileged, but if the user specifies --security apparmor:PROFILE,
with --privileged, we should do both.
Added e2e run_apparmor_test.go
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index ea2c7d8e0..fbdae83fa 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -41,7 +41,6 @@ case "${OS_RELEASE_ID}" in ubuntu) apt-get update apt-get install -y containers-common - sed -ie 's/^\(# \)\?apparmor_profile =.*/apparmor_profile = ""/' /etc/containers/containers.conf if [[ "$OS_RELEASE_VER" == "19" ]]; then apt-get purge -y --auto-remove golang* apt-get install -y golang-1.13 |