Merge pull request #5534 from vieux/fix_apparmor_inside_container

Fix apparmor inside container

Dockerfile

@@ -47,7 +47,6 @@ RUN	apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
 	ruby1.9.1 \
 	ruby1.9.1-dev \
 	s3cmd=1.1.0* \
-	apparmor \
 	--no-install-recommends
 
 # Get and compile LXC 0.8 (since it is the most stable)

hack/dind

@@ -9,6 +9,9 @@
 
 # Usage: dind CMD [ARG...]
 
+# apparmor sucks and Docker needs to know that it's in a container (c) @tianon
+export container=docker
+
 # First, make sure that cgroups are mounted correctly.
 CGROUP=/sys/fs/cgroup
 

pkg/apparmor/apparmor.go

@@ -13,7 +13,7 @@ import (
 )
 
 func IsEnabled() bool {
-	if _, err := os.Stat("/sys/kernel/security/apparmor"); err == nil {
+	if _, err := os.Stat("/sys/kernel/security/apparmor"); err == nil && os.Getenv("container") == "" {
 		buf, err := ioutil.ReadFile("/sys/module/apparmor/parameters/enabled")
 		return err == nil && len(buf) > 1 && buf[0] == 'Y'
 	}