GitList

Browse code

skip apparmor with dind

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

Victor Vieux authored on 2014/05/02 06:52:29
Showing 2 changed files

hack/dind index e3641a3..d4731af 100755
pkg/apparmor/apparmor.go index 0987398..6fdb1f8 100644

@@ -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

History View file @ de191e8

@@ -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'
 	}

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