Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit d2f06c7

Browse files
authored
Merge pull request #372 from thaJeztah/19.03_backport_bump_libnetwork
[19.03 backport] bump libnetwork to 96bcc0dae898308ed659c5095526788a602f4726 Upstream-commit: 63f2e107b3b08a229aa15d241c7a054cf2518b22 Component: engine
2 parents a10113f + 127fda4 commit d2f06c7

File tree

7 files changed

+64
-22
lines changed

7 files changed

+64
-22
lines changed

components/engine/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=92d1fbe1eb0883cf11d283cea8e658275146411d
6+
LIBNETWORK_COMMIT=96bcc0dae898308ed659c5095526788a602f4726
77

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

components/engine/vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ github.com/gofrs/flock 7f43ea2e6a643ad441fc12d0ecc0
3939
# libnetwork
4040

4141
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
42-
github.com/docker/libnetwork 92d1fbe1eb0883cf11d283cea8e658275146411d
42+
github.com/docker/libnetwork 96bcc0dae898308ed659c5095526788a602f4726
4343
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
4444
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
4545
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

components/engine/vendor/github.com/docker/libnetwork/driverapi/driverapi.go

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

components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_forwarding.go

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

components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows.go

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

components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows_store.go

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

components/engine/vendor/github.com/docker/libnetwork/network.go

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

0 commit comments

Comments
 (0)