From 6261d99318564269bd6efc65963474779681945f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 28 Feb 2018 21:39:59 +0100 Subject: [PATCH] Bump Runc to 1.0.0-rc5 / 4fc53a81fb7c994640722ac585fa9ca548971871 Release notes: https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc5 Possibly relevant changes included: - chroot when no mount namespaces is provided - fix systemd slice expansion so that it could be consumed by cAdvisor - libcontainer/capabilities_linux: Drop os.Getpid() call - Update console dependency to fix runc exec on BE (causing: `container_linux.go:265: starting container process caused "open /dev/pts/4294967296: no such file or directory"`) - libcontainer: setupUserNamespace is always called (fixes: Devices are mounted with wrong uid/gid) Signed-off-by: Sebastiaan van Stijn Upstream-commit: a2f5a1a5b2d77d694c5bd47798be15b3c0bcdf70 Component: engine --- .../engine/hack/dockerfile/install/runc.installer | 2 +- components/engine/vendor.conf | 2 +- .../vendor/github.com/opencontainers/runc/README.md | 10 ++++++++++ .../vendor/github.com/opencontainers/runc/vendor.conf | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/components/engine/hack/dockerfile/install/runc.installer b/components/engine/hack/dockerfile/install/runc.installer index 923ae706e1..8ec5efc44e 100755 --- a/components/engine/hack/dockerfile/install/runc.installer +++ b/components/engine/hack/dockerfile/install/runc.installer @@ -1,7 +1,7 @@ #!/bin/sh # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly -RUNC_COMMIT=6c55f98695e902427906eed2c799e566e3d3dfb5 +RUNC_COMMIT=4fc53a81fb7c994640722ac585fa9ca548971871 install_runc() { # Do not build with ambient capabilities support diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index dd641112e9..4b327fafaf 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -72,7 +72,7 @@ github.com/pborman/uuid v1.0 google.golang.org/grpc v1.3.0 # When updating, also update RUNC_COMMIT in hack/dockerfile/install/runc accordingly -github.com/opencontainers/runc 6c55f98695e902427906eed2c799e566e3d3dfb5 +github.com/opencontainers/runc 4fc53a81fb7c994640722ac585fa9ca548971871 github.com/opencontainers/runtime-spec v1.0.1 github.com/opencontainers/image-spec v1.0.1 github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0 diff --git a/components/engine/vendor/github.com/opencontainers/runc/README.md b/components/engine/vendor/github.com/opencontainers/runc/README.md index 3ca7a1a227..3d72ad34fe 100644 --- a/components/engine/vendor/github.com/opencontainers/runc/README.md +++ b/components/engine/vendor/github.com/opencontainers/runc/README.md @@ -41,8 +41,18 @@ make sudo make install ``` +You can also use `go get` to install to your `GOPATH`, assuming that you have a `github.com` parent folder already created under `src`: + +```bash +go get github.com/opencontainers/runc +cd $GOPATH/src/github.com/opencontainers/runc +make +sudo make install +``` + `runc` will be installed to `/usr/local/sbin/runc` on your system. + #### Build Tags `runc` supports optional build tags for compiling support of various features. diff --git a/components/engine/vendor/github.com/opencontainers/runc/vendor.conf b/components/engine/vendor/github.com/opencontainers/runc/vendor.conf index 0ab4685fd7..e2b519e673 100644 --- a/components/engine/vendor/github.com/opencontainers/runc/vendor.conf +++ b/components/engine/vendor/github.com/opencontainers/runc/vendor.conf @@ -21,5 +21,5 @@ github.com/urfave/cli d53eb991652b1d438abdd34ce4bfa3ef1539108e golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce https://github.com/golang/sys # console dependencies -github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e +github.com/containerd/console 2748ece16665b45a47f884001d5831ec79703880 github.com/pkg/errors v0.8.0