vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Update libcontainer

Browse source 
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 <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2015-07-16 16:00:55 -07:00
parent 1601bba9a5
commit b069f4c9c2
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
homedir/homedir.go
View file

@ -4,7 +4,7 @@ import (
"os" "os"
"runtime" "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 // Key returns the env var name for the user's home dir based on

2
sockets/unix_socket.go
View file

@ -11,7 +11,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/listenbuffer" "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) { func NewUnixSocket(path, group string, activate <-chan struct{}) (net.Listener, error) {

2
sysinfo/sysinfo_linux.go
View file

@ -7,7 +7,7 @@ import (
"strings" "strings"
"github.com/Sirupsen/logrus" "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. // New returns a new SysInfo, using the filesystem to detect which features the kernel supports.