Merge pull request #5809 from crosbymichael/move-cgroups

Move cgroups package into libcontainer

daemon/execdriver/lxc/driver.go

@@ -15,8 +15,8 @@ import (
 	"time"
 
 	"github.com/dotcloud/docker/daemon/execdriver"
-	"github.com/dotcloud/docker/pkg/cgroups"
 	"github.com/dotcloud/docker/pkg/label"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 	"github.com/dotcloud/docker/pkg/system"
 	"github.com/dotcloud/docker/utils"
 )

daemon/execdriver/native/driver.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/dotcloud/docker/daemon/execdriver"
 	"github.com/dotcloud/docker/pkg/apparmor"
-	"github.com/dotcloud/docker/pkg/cgroups"
 	"github.com/dotcloud/docker/pkg/libcontainer"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 	"github.com/dotcloud/docker/pkg/libcontainer/nsinit"
 	"github.com/dotcloud/docker/pkg/system"
 )

daemon/execdriver/native/template/default_template.go

@@ -2,8 +2,8 @@ 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/cgroups"
 )
 
 // New returns the docker default configuration for libcontainer

pkg/cgroups/MAINTAINERS

@@ -1,3 +0,0 @@
-Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
-Rohit Jnagal <jnagal@google.com> (@rjnagal)
-Victor Marmol <vmarmol@google.com> (@vmarmol)

pkg/libcontainer/cgroups/fs/apply_raw.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/dotcloud/docker/pkg/cgroups"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 )
 
 var (

pkg/libcontainer/cgroups/fs/blkio.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/dotcloud/docker/pkg/cgroups"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 )
 
 type blkioGroup struct {

pkg/libcontainer/cgroups/fs/cpuacct.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/dotcloud/docker/pkg/cgroups"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 	"github.com/dotcloud/docker/pkg/system"
 )
 

pkg/libcontainer/cgroups/fs/freezer.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/dotcloud/docker/pkg/cgroups"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 )
 
 type freezerGroup struct {

pkg/libcontainer/cgroups/fs/perf_event.go

@@ -1,7 +1,7 @@
 package fs
 
 import (
-	"github.com/dotcloud/docker/pkg/cgroups"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 )
 
 type perfEventGroup struct {

pkg/libcontainer/cgroups/systemd/apply_nosystemd.go

@@ -4,7 +4,8 @@ package systemd
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/pkg/cgroups"
+
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 )
 
 func UseSystemd() bool {

pkg/libcontainer/cgroups/systemd/apply_systemd.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 
 	systemd1 "github.com/coreos/go-systemd/dbus"
-	"github.com/dotcloud/docker/pkg/cgroups"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 	"github.com/dotcloud/docker/pkg/systemd"
 	"github.com/godbus/dbus"
 )

pkg/libcontainer/container.go

@@ -1,7 +1,7 @@
 package libcontainer
 
 import (
-	"github.com/dotcloud/docker/pkg/cgroups"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 )
 
 // Context is a generic key value pair that allows

pkg/libcontainer/nsinit/exec.go

@@ -7,10 +7,10 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/dotcloud/docker/pkg/cgroups"
-	"github.com/dotcloud/docker/pkg/cgroups/fs"
-	"github.com/dotcloud/docker/pkg/cgroups/systemd"
 	"github.com/dotcloud/docker/pkg/libcontainer"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd"
 	"github.com/dotcloud/docker/pkg/libcontainer/network"
 	"github.com/dotcloud/docker/pkg/system"
 )

pkg/libcontainer/nsinit/unsupported.go

@@ -3,8 +3,8 @@
 package nsinit
 
 import (
-	"github.com/dotcloud/docker/pkg/cgroups"
 	"github.com/dotcloud/docker/pkg/libcontainer"
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 )
 
 func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath string, args []string, createCommand CreateCommand, startCallback func()) (int, error) {

pkg/sysinfo/sysinfo.go

@@ -1,11 +1,12 @@
 package sysinfo
 
 import (
-	"github.com/dotcloud/docker/pkg/cgroups"
 	"io/ioutil"
 	"log"
 	"os"
 	"path"
+
+	"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
 )
 
 type SysInfo struct {