From c5f3d6fd5b41753db0e265d95ab861e54271d908 Mon Sep 17 00:00:00 2001 From: Eric Windisch Date: Wed, 29 Jul 2015 17:45:32 -0400 Subject: [PATCH] Remove container AA profile from packaging Signed-off-by: Eric Windisch Upstream-commit: 0f4e5f71491abc0e7c4f4effe1f3c59aa9bf6a33 Component: engine --- components/engine/hack/make/.build-deb/rules | 1 - components/engine/hack/make/ubuntu | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/components/engine/hack/make/.build-deb/rules b/components/engine/hack/make/.build-deb/rules index ae2defcc0b..be45676c1d 100755 --- a/components/engine/hack/make/.build-deb/rules +++ b/components/engine/hack/make/.build-deb/rules @@ -34,7 +34,6 @@ override_dh_installudev: override_dh_install: dh_install - dh_apparmor --profile-name=docker -pdocker-engine dh_apparmor --profile-name=docker-engine -pdocker-engine %: diff --git a/components/engine/hack/make/ubuntu b/components/engine/hack/make/ubuntu index 76c3f29053..24246da76a 100644 --- a/components/engine/hack/make/ubuntu +++ b/components/engine/hack/make/ubuntu @@ -74,8 +74,7 @@ bundle_ubuntu() { # Include contributed apparmor policy mkdir -p "$DIR/etc/apparmor.d/" - cp contrib/apparmor/docker "$DIR/etc/apparmor.d/" - cp contrib/apparmor/docker-engine "$DIR/etc/apparmor.d/" + cp contrib/apparmor/* "$DIR/etc/apparmor.d/" # Copy the binary # This will fail if the binary bundle hasn't been built @@ -95,7 +94,6 @@ if [ "$1" = 'configure' ] && [ -z "$2" ]; then fi if ( aa-status --enabled ); then - /sbin/apparmor_parser -r -W -T /etc/apparmor.d/docker /sbin/apparmor_parser -r -W -T /etc/apparmor.d/docker-engine fi