Browse code

vndr libnetwork to adjust for updated runc

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Andrew Hsu authored on 2018/12/07 10:53:00
Showing 5 changed files
... ...
@@ -3,7 +3,7 @@
3 3
 # LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
4 4
 # updating the binary version, consider updating github.com/docker/libnetwork
5 5
 # in vendor.conf accordingly
6
-LIBNETWORK_COMMIT=49627167f0585504fd78ed8827529aec57a9618d
6
+LIBNETWORK_COMMIT=1a06131fb8a047d919f7deaf02a4c414d7884b83
7 7
 
8 8
 install_proxy() {
9 9
 	case "$1" in
... ...
@@ -37,7 +37,7 @@ github.com/mitchellh/hashstructure 2bca23e0e452137f789efbc8610126fd8b94f73b
37 37
 #get libnetwork packages
38 38
 
39 39
 # When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
40
-github.com/docker/libnetwork 1f28166bb386cf9223d2d00a28382b0e474be314
40
+github.com/docker/libnetwork 1a06131fb8a047d919f7deaf02a4c414d7884b83
41 41
 github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
42 42
 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
43 43
 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
... ...
@@ -13,7 +13,7 @@ import (
13 13
 	"path/filepath"
14 14
 
15 15
 	"github.com/docker/libnetwork/types"
16
-	"github.com/opencontainers/runc/libcontainer/configs"
16
+	"github.com/opencontainers/runtime-spec/specs-go"
17 17
 	"github.com/sirupsen/logrus"
18 18
 )
19 19
 
... ...
@@ -25,7 +25,7 @@ const (
25 25
 
26 26
 // processSetKeyReexec is a private function that must be called only on an reexec path
27 27
 // It expects 3 args { [0] = "libnetwork-setkey", [1] = <container-id>, [2] = <controller-id> }
28
-// It also expects configs.HookState as a json string in <stdin>
28
+// It also expects specs.State as a json string in <stdin>
29 29
 // Refer to https://github.com/opencontainers/runc/pull/160/ for more information
30 30
 // The docker exec-root can be specified as "-exec-root" flag. The default value is "/run/docker".
31 31
 func processSetKeyReexec() {
... ...
@@ -50,12 +50,12 @@ func processSetKeyReexec() {
50 50
 	}
51 51
 	containerID, controllerID := args[0], args[1]
52 52
 
53
-	// We expect configs.HookState as a json string in <stdin>
53
+	// We expect specs.State as a json string in <stdin>
54 54
 	stateBuf, err := ioutil.ReadAll(os.Stdin)
55 55
 	if err != nil {
56 56
 		return
57 57
 	}
58
-	var state configs.HookState
58
+	var state specs.State
59 59
 	if err = json.Unmarshal(stateBuf, &state); err != nil {
60 60
 		return
61 61
 	}
... ...
@@ -64,7 +64,7 @@ func (c *controller) addContainerNameResolution(nID, eID, containerName string,
64 64
 
65 65
 	// Add resolution for taskaliases
66 66
 	for _, alias := range taskAliases {
67
-		n.(*network).addSvcRecords(eID, alias, eID, ip, nil, true, method)
67
+		n.(*network).addSvcRecords(eID, alias, eID, ip, nil, false, method)
68 68
 	}
69 69
 
70 70
 	return nil
... ...
@@ -32,7 +32,7 @@ github.com/mattn/go-shellwords v1.0.3
32 32
 github.com/miekg/dns v1.0.7
33 33
 github.com/opencontainers/go-digest v1.0.0-rc1
34 34
 github.com/opencontainers/image-spec v1.0.1
35
-github.com/opencontainers/runc 69663f0bd4b60df09991c08812a60108003fa340
35
+github.com/opencontainers/runc 96ec2177ae841256168fcf76954f7177af9446eb
36 36
 github.com/opencontainers/runtime-spec v1.0.1
37 37
 github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374
38 38
 github.com/sirupsen/logrus v1.0.3