Merge pull request #1755 from mrunalp/update_runc

Update runc to latest
cri-o · Aug 24, 2018 · aa4f63c · aa4f63c
2 parents c71d473 + 6c4e857
commit aa4f63c
Show file tree

Hide file tree

Showing 22 changed files with 521 additions and 165 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -59,7 +59,7 @@ RUN mkdir -p /usr/src/criu \
     && rm -rf /usr/src/criu
 
 # Install runc
-ENV RUNC_COMMIT ce80fa0a64803d52883955cb77b2708b438a0b28
+ENV RUNC_COMMIT 459bfaec1fc6c17d8bfb12d0a0f69e7e7271ed2a
 RUN set -x \
 	&& export GOPATH="$(mktemp -d)" \
 	&& git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \

diff --git a/contrib/test/integration/build/runc.yml b/contrib/test/integration/build/runc.yml
@@ -4,7 +4,7 @@
   git:
     repo: "https://github.com/opencontainers/runc.git"
     dest: "{{ ansible_env.GOPATH }}/src/github.com/opencontainers/runc"
-    version: "ce80fa0a64803d52883955cb77b2708b438a0b28"
+    version: "459bfaec1fc6c17d8bfb12d0a0f69e7e7271ed2a"
 
 - name: build runc
   make:

diff --git a/vendor.conf b/vendor.conf
@@ -22,7 +22,7 @@ google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85
 github.com/opencontainers/selinux b6fa367ed7f534f9ba25391cc2d467085dbb445a
 github.com/opencontainers/go-digest v1.0.0-rc0
 github.com/opencontainers/runtime-tools 1c243a8a8eb44d491790798afc9b634c6f6a6380
-github.com/opencontainers/runc ce80fa0a64803d52883955cb77b2708b438a0b28
+github.com/opencontainers/runc 459bfaec1fc6c17d8bfb12d0a0f69e7e7271ed2a
 github.com/mrunalp/fileutils master
 github.com/vishvananda/netlink master
 github.com/vishvananda/netns master

diff --git a/vendor/github.com/opencontainers/runc/README.md b/vendor/github.com/opencontainers/runc/README.md
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/configs/validate/rootless.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/validate/rootless.go
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/configs/validate/validator.go b/vendor/github.com/opencontainers/runc/libcontainer/configs/validate/validator.go