From 675ce830a93c40e2ceb3dc818dc2bc8ac0a0ff1b Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 1 May 2014 21:52:29 +0000 Subject: [PATCH] skip apparmor with dind Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: de191e86321f7d3136ff42ff75826b8107399497 Component: engine --- components/engine/hack/dind | 3 +++ components/engine/pkg/apparmor/apparmor.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/engine/hack/dind b/components/engine/hack/dind index e3641a342f..d4731aff75 100755 --- a/components/engine/hack/dind +++ b/components/engine/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 diff --git a/components/engine/pkg/apparmor/apparmor.go b/components/engine/pkg/apparmor/apparmor.go index 0987398124..6fdb1f8958 100644 --- a/components/engine/pkg/apparmor/apparmor.go +++ b/components/engine/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' }