Skip to content

Commit 5fd8d70

Browse files
author
Arko Dasgupta
committed
Vendor in libnetwork changes
Vendor in IP6Tables fixes moby/libnetwork#2600 moby/libnetwork#2603 Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
1 parent d17cf21 commit 5fd8d70

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

‎hack/dockerfile/install/proxy.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
44
# updating the binary version, consider updating github.com/docker/libnetwork
55
# in vendor.conf accordingly
6-
: "${LIBNETWORK_COMMIT:=a543cbc4871f904b0efe205708eb45d72e65fd8b}"
6+
: "${LIBNETWORK_COMMIT:=5c6a95bfb20c61571a00f913c6b91959ede84e8d}"
77

88
install_proxy() {
99
case "$1" in

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ github.com/grpc-ecosystem/go-grpc-middleware 3c51f7f332123e8be5a157c0802a
4747
# libnetwork
4848

4949
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
50-
github.com/docker/libnetwork a543cbc4871f904b0efe205708eb45d72e65fd8b
50+
github.com/docker/libnetwork 5c6a95bfb20c61571a00f913c6b91959ede84e8d
5151
github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f
5252
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
5353
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

‎vendor/github.com/docker/libnetwork/drivers/bridge/bridge.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go‎

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/libnetwork/iptables/iptables.go‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)