kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

vndr libnetwork to adjust for updated runc

Browse source 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Andrew Hsu 2018-12-07 01:53:00 +00:00 • committed by Sebastiaan van Stijn
parent 615eecf8ac
commit 75c4b74155
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/dockerfile/install/proxy.installer
View file

@ -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=49627167f0585504fd78ed8827529aec57a9618d
LIBNETWORK_COMMIT=1a06131fb8a047d919f7deaf02a4c414d7884b83
install_proxy() {
case "$1" in

2
vendor.conf
View file

@ -37,7 +37,7 @@ github.com/mitchellh/hashstructure 2bca23e0e452137f789efbc8610126fd8b94f73b
#get libnetwork packages
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
github.com/docker/libnetwork 1f28166bb386cf9223d2d00a28382b0e474be314
github.com/docker/libnetwork 1a06131fb8a047d919f7deaf02a4c414d7884b83
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

8
vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go generated vendored
View file

@ -13,7 +13,7 @@ import (
"path/filepath"
"github.com/docker/libnetwork/types"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/sirupsen/logrus"
)
@ -25,7 +25,7 @@ const (
// processSetKeyReexec is a private function that must be called only on an reexec path
// It expects 3 args { [0] = "libnetwork-setkey", [1] = <container-id>, [2] = <controller-id> }
// It also expects configs.HookState as a json string in <stdin>
// It also expects specs.State as a json string in <stdin>
// Refer to https://github.com/opencontainers/runc/pull/160/ for more information
// The docker exec-root can be specified as "-exec-root" flag. The default value is "/run/docker".
func processSetKeyReexec() {
@ -50,12 +50,12 @@ func processSetKeyReexec() {
}
containerID, controllerID := args[0], args[1]
// We expect configs.HookState as a json string in <stdin>
// We expect specs.State as a json string in <stdin>
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
}

2
vendor/github.com/docker/libnetwork/service_common.go generated vendored
View file

@ -64,7 +64,7 @@ func (c *controller) addContainerNameResolution(nID, eID, containerName string,
// Add resolution for taskaliases
for _, alias := range taskAliases {
n.(*network).addSvcRecords(eID, alias, eID, ip, nil, true, method)
n.(*network).addSvcRecords(eID, alias, eID, ip, nil, false, method)
}
return nil

2
vendor/github.com/docker/libnetwork/vendor.conf generated vendored
View file

@ -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