From 052cc5a6378ee4bbe1ef79e5632e2439d68ddbde Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Sun, 13 Apr 2014 23:33:25 +0000 Subject: [PATCH] Move apparmor to top level pkg Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- pkg/{libcontainer => }/apparmor/apparmor.go | 0 pkg/{libcontainer => }/apparmor/apparmor_disabled.go | 0 pkg/{libcontainer => }/apparmor/setup.go | 0 pkg/libcontainer/nsinit/init.go | 2 +- runtime/execdriver/native/create.go | 2 +- runtime/execdriver/native/driver.go | 2 +- runtime/execdriver/native/template/default_template.go | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename pkg/{libcontainer => }/apparmor/apparmor.go (100%) rename pkg/{libcontainer => }/apparmor/apparmor_disabled.go (100%) rename pkg/{libcontainer => }/apparmor/setup.go (100%) diff --git a/pkg/libcontainer/apparmor/apparmor.go b/pkg/apparmor/apparmor.go similarity index 100% rename from pkg/libcontainer/apparmor/apparmor.go rename to pkg/apparmor/apparmor.go diff --git a/pkg/libcontainer/apparmor/apparmor_disabled.go b/pkg/apparmor/apparmor_disabled.go similarity index 100% rename from pkg/libcontainer/apparmor/apparmor_disabled.go rename to pkg/apparmor/apparmor_disabled.go diff --git a/pkg/libcontainer/apparmor/setup.go b/pkg/apparmor/setup.go similarity index 100% rename from pkg/libcontainer/apparmor/setup.go rename to pkg/apparmor/setup.go diff --git a/pkg/libcontainer/nsinit/init.go b/pkg/libcontainer/nsinit/init.go index b6c02eafd5..0e85c0e4be 100644 --- a/pkg/libcontainer/nsinit/init.go +++ b/pkg/libcontainer/nsinit/init.go @@ -8,9 +8,9 @@ import ( "runtime" "syscall" + "github.com/dotcloud/docker/pkg/apparmor" "github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/capabilities" "github.com/dotcloud/docker/pkg/libcontainer/network" "github.com/dotcloud/docker/pkg/libcontainer/utils" diff --git a/runtime/execdriver/native/create.go b/runtime/execdriver/native/create.go index 12546145f9..ac67839e4b 100644 --- a/runtime/execdriver/native/create.go +++ b/runtime/execdriver/native/create.go @@ -4,9 +4,9 @@ import ( "fmt" "os" + "github.com/dotcloud/docker/pkg/apparmor" "github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/runtime/execdriver" "github.com/dotcloud/docker/runtime/execdriver/native/configuration" "github.com/dotcloud/docker/runtime/execdriver/native/template" diff --git a/runtime/execdriver/native/driver.go b/runtime/execdriver/native/driver.go index d18865e508..c99cae31dd 100644 --- a/runtime/execdriver/native/driver.go +++ b/runtime/execdriver/native/driver.go @@ -3,9 +3,9 @@ package native import ( "encoding/json" "fmt" + "github.com/dotcloud/docker/pkg/apparmor" "github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" "github.com/dotcloud/docker/pkg/libcontainer/nsinit" "github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/runtime/execdriver" diff --git a/runtime/execdriver/native/template/default_template.go b/runtime/execdriver/native/template/default_template.go index d3c433a317..c354637fcb 100644 --- a/runtime/execdriver/native/template/default_template.go +++ b/runtime/execdriver/native/template/default_template.go @@ -1,9 +1,9 @@ package template import ( + "github.com/dotcloud/docker/pkg/apparmor" "github.com/dotcloud/docker/pkg/cgroups" "github.com/dotcloud/docker/pkg/libcontainer" - "github.com/dotcloud/docker/pkg/libcontainer/apparmor" ) // New returns the docker default configuration for libcontainer