Browse code

Remove container AA profile from packaging

Signed-off-by: Eric Windisch <eric@windisch.us>

Eric Windisch authored on 2015/07/30 06:45:32
Showing 2 changed files
... ...
@@ -34,7 +34,6 @@ override_dh_installudev:
34 34
 
35 35
 override_dh_install:
36 36
 	dh_install
37
-	dh_apparmor --profile-name=docker -pdocker-engine
38 37
 	dh_apparmor --profile-name=docker-engine -pdocker-engine
39 38
 
40 39
 %:
... ...
@@ -74,8 +74,7 @@ bundle_ubuntu() {
74 74
 
75 75
 	# Include contributed apparmor policy
76 76
 	mkdir -p "$DIR/etc/apparmor.d/"
77
-	cp contrib/apparmor/docker "$DIR/etc/apparmor.d/"
78
-	cp contrib/apparmor/docker-engine "$DIR/etc/apparmor.d/"
77
+	cp contrib/apparmor/* "$DIR/etc/apparmor.d/"
79 78
 
80 79
 	# Copy the binary
81 80
 	# This will fail if the binary bundle hasn't been built
... ...
@@ -95,7 +94,6 @@ if [ "$1" = 'configure' ] && [ -z "$2" ]; then
95 95
 fi
96 96
 
97 97
 if ( aa-status --enabled ); then
98
-	/sbin/apparmor_parser -r -W -T /etc/apparmor.d/docker
99 98
 	/sbin/apparmor_parser -r -W -T /etc/apparmor.d/docker-engine
100 99
 fi
101 100