From 42b5bd7c0f2ebc0f0a8606d32cca70706ff96f77 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Fri, 7 Dec 2018 01:53:00 +0000 Subject: [PATCH] vndr libnetwork to adjust for updated runc Signed-off-by: Andrew Hsu Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 75c4b741550a3c5cb061269cc92a5d563d153626) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 5cd4797c89383159219716de92775138c2dd17c5 Component: engine --- components/engine/hack/dockerfile/install/proxy.installer | 2 +- components/engine/vendor.conf | 2 +- .../docker/libnetwork/sandbox_externalkey_unix.go | 8 ++++---- .../vendor/github.com/docker/libnetwork/vendor.conf | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/engine/hack/dockerfile/install/proxy.installer b/components/engine/hack/dockerfile/install/proxy.installer index 1027edf823..05a9da7f0e 100755 --- a/components/engine/hack/dockerfile/install/proxy.installer +++ b/components/engine/hack/dockerfile/install/proxy.installer @@ -3,7 +3,7 @@ # LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When # updating the binary version, consider updating github.com/docker/libnetwork # in vendor.conf accordingly -LIBNETWORK_COMMIT=8bc51fd276b549b106dbc7bf8ab18b3a01d66e64 # bump_18.09 branch +LIBNETWORK_COMMIT=2cfbf9b1f98162a55829a21cc603c76072a75382 # bump_18.09 branch install_proxy() { case "$1" in diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index 1f905c1347..01f5cfe14a 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -37,7 +37,7 @@ github.com/mitchellh/hashstructure 2bca23e0e452137f789efbc8610126fd8b94f73b #get libnetwork packages # When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy accordingly -github.com/docker/libnetwork 8bc51fd276b549b106dbc7bf8ab18b3a01d66e64 # bump_18.09 branch +github.com/docker/libnetwork 2cfbf9b1f98162a55829a21cc603c76072a75382 # bump_18.09 branch github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec diff --git a/components/engine/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go b/components/engine/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go index f4c4276848..77ad40c8a5 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go +++ b/components/engine/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go @@ -11,7 +11,7 @@ import ( "os" "github.com/docker/libnetwork/types" - "github.com/opencontainers/runc/libcontainer/configs" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) @@ -20,7 +20,7 @@ const success = "success" // processSetKeyReexec is a private function that must be called only on an reexec path // It expects 3 args { [0] = "libnetwork-setkey", [1] = , [2] = } -// It also expects configs.HookState as a json string in +// It also expects specs.State as a json string in // Refer to https://github.com/opencontainers/runc/pull/160/ for more information func processSetKeyReexec() { var err error @@ -39,12 +39,12 @@ func processSetKeyReexec() { } containerID := os.Args[1] - // We expect configs.HookState as a json string in + // We expect specs.State as a json string in stateBuf, err := ioutil.ReadAll(os.Stdin) if err != nil { return } - var state configs.HookState + var state specs.State if err = json.Unmarshal(stateBuf, &state); err != nil { return } diff --git a/components/engine/vendor/github.com/docker/libnetwork/vendor.conf b/components/engine/vendor/github.com/docker/libnetwork/vendor.conf index 0a99a438f6..8a4ded7e8b 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/vendor.conf +++ b/components/engine/vendor/github.com/docker/libnetwork/vendor.conf @@ -32,7 +32,7 @@ github.com/mattn/go-shellwords v1.0.3 github.com/miekg/dns v1.0.7 github.com/opencontainers/go-digest v1.0.0-rc1 github.com/opencontainers/image-spec v1.0.1 -github.com/opencontainers/runc 69663f0bd4b60df09991c08812a60108003fa340 +github.com/opencontainers/runc 96ec2177ae841256168fcf76954f7177af9446eb github.com/opencontainers/runtime-spec v1.0.1 github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374 github.com/sirupsen/logrus v1.0.3