From 22496306d56338136e1df4d5d2af092127841621 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael@netdirect.ca>
Date: Mon, 7 Apr 2014 03:04:27 -0400
Subject: [PATCH] apparmor: pull in variables from tunables/global

The variables that were defined at the top of the apparmor profile are best
pulled in via the <tunables/global> include.

Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org> (github: Supermathie)
Upstream-commit: 726206f2aa45b8a537ae6d6c819f21befc2e0aca
Component: engine
---
 components/engine/pkg/libcontainer/apparmor/setup.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/components/engine/pkg/libcontainer/apparmor/setup.go b/components/engine/pkg/libcontainer/apparmor/setup.go
index d9deec470e..4c664598ad 100644
--- a/components/engine/pkg/libcontainer/apparmor/setup.go
+++ b/components/engine/pkg/libcontainer/apparmor/setup.go
@@ -11,13 +11,8 @@ import (
 const DefaultProfilePath = "/etc/apparmor.d/docker"
 const DefaultProfile = `
 # AppArmor profile from lxc for containers.
-@{HOME}=@{HOMEDIRS}/*/ /root/
-@{HOMEDIRS}=/home/
-#@{HOMEDIRS}+=
-@{multiarch}=*-linux-gnu*
-@{PROC}=/proc/
-@{pid}=self
 
+#include <tunables/global>
 profile docker-default flags=(attach_disconnected,mediate_deleted) {
   #include <abstractions/base>
   network,