From b069f4c9c2350fb90db5a2c8084382f13d65adb6 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Thu, 16 Jul 2015 16:00:55 -0700 Subject: [PATCH] Update libcontainer Replaced github.com/docker/libcontainer with github.com/opencontainers/runc/libcontaier. Also I moved AppArmor profile generation to docker. Main idea of this update is to fix mounting cgroups inside containers. After updating docker on CI we can even remove dind. Signed-off-by: Alexander Morozov --- homedir/homedir.go | 2 +- sockets/unix_socket.go | 2 +- sysinfo/sysinfo_linux.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homedir/homedir.go b/homedir/homedir.go index 61137a8..8154e83 100644 --- a/homedir/homedir.go +++ b/homedir/homedir.go @@ -4,7 +4,7 @@ import ( "os" "runtime" - "github.com/docker/libcontainer/user" + "github.com/opencontainers/runc/libcontainer/user" ) // Key returns the env var name for the user's home dir based on diff --git a/sockets/unix_socket.go b/sockets/unix_socket.go index 0536382..fde11f5 100644 --- a/sockets/unix_socket.go +++ b/sockets/unix_socket.go @@ -11,7 +11,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/listenbuffer" - "github.com/docker/libcontainer/user" + "github.com/opencontainers/runc/libcontainer/user" ) func NewUnixSocket(path, group string, activate <-chan struct{}) (net.Listener, error) { diff --git a/sysinfo/sysinfo_linux.go b/sysinfo/sysinfo_linux.go index e9d6b3d..f864dcd 100644 --- a/sysinfo/sysinfo_linux.go +++ b/sysinfo/sysinfo_linux.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/Sirupsen/logrus" - "github.com/docker/libcontainer/cgroups" + "github.com/opencontainers/runc/libcontainer/cgroups" ) // New returns a new SysInfo, using the filesystem to detect which features the kernel supports.