From 6cea6d40fce0122e50b8852ff6fd6d5b9856b182 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Fri, 10 Mar 2017 08:13:02 -0800 Subject: [PATCH] Update runc to 9c2d8d184e5da67c95d601382adf14862e4f2228 This fix a conflict with systemd daemon-reload (see https://github.com/opencontainers/runc/pull/1344) Signed-off-by: Kenfe-Mickael Laventure --- hack/dockerfile/binaries-commits | 2 +- vendor.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/dockerfile/binaries-commits b/hack/dockerfile/binaries-commits index 94673b65b3..ea26eb367b 100644 --- a/hack/dockerfile/binaries-commits +++ b/hack/dockerfile/binaries-commits @@ -3,7 +3,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly -RUNC_COMMIT=54296cf40ad8143b62dbcaa1d90e520a2136ddfe +RUNC_COMMIT=9c2d8d184e5da67c95d601382adf14862e4f2228 CONTAINERD_COMMIT=9f68f96b8c0746e254b52bc1defcf7cc0c1a62eb TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574 LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e diff --git a/vendor.conf b/vendor.conf index 1d5b9eaa0d..a2868e9fec 100644 --- a/vendor.conf +++ b/vendor.conf @@ -61,7 +61,7 @@ github.com/docker/go v1.5.1-1-1-gbaf439e github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c # When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly -github.com/opencontainers/runc 54296cf40ad8143b62dbcaa1d90e520a2136ddfe https://github.com/docker/runc.git # libcontainer +github.com/opencontainers/runc 9c2d8d184e5da67c95d601382adf14862e4f2228 https://github.com/docker/runc.git # libcontainer github.com/opencontainers/runtime-spec 1c7c27d043c2a5e513a44084d2b10d77d1402b8c # specs github.com/seccomp/libseccomp-golang v0.9.0 # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)