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 /contrib | |
| 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 '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 |