Переглянути джерело

Remove container AA profile from packaging

Signed-off-by: Eric Windisch <eric@windisch.us>
(cherry picked from commit 0f4e5f71491abc0e7c4f4effe1f3c59aa9bf6a33)
Eric Windisch 10 роки тому
батько
коміт
5851e2da60
2 змінених файлів з 1 додано та 4 видалено
  1. 0 1
      hack/make/.build-deb/rules
  2. 1 3
      hack/make/ubuntu

+ 0 - 1
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
 
 %:

+ 1 - 3
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