toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki 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>
Upstream-commit: c86189d554ba14aa04b6314970d3699e5ddbf4de
Component: engine
This commit is contained in:
Alexander Morozov
2015-07-16 16:00:55 -07:00
parent d192eb2289
commit d9e652a366
156 changed files with 350 additions and 1052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/stats_linux.go
View File

@ -2,8 +2,8 @@ package daemon
import (
"github.com/docker/docker/api/types"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/cgroups"
)
// convertStatsToAPITypes converts the libcontainer.Stats to the api specific