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

Commit d7f325f

Browse files
Merge component 'engine' from git@github.com:docker/engine 19.03
2 parents 9424aea + f1aa3ee commit d7f325f

4 files changed

Lines changed: 27 additions & 2 deletions

File tree

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:=71d4d82a5ce50453b1121d95544f0a2ae95bef9b} # bump_19.03 branch
6+
: ${LIBNETWORK_COMMIT:=153d0769a1181bf591a9637fd487a541ec7db1e6} # bump_19.03 branch
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
@@ -38,7 +38,7 @@ github.com/gofrs/flock 7f43ea2e6a643ad441fc12d0ecc0
3838
# libnetwork
3939

4040
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
41-
github.com/docker/libnetwork 71d4d82a5ce50453b1121d95544f0a2ae95bef9b # bump_19.03 branch
41+
github.com/docker/libnetwork 153d0769a1181bf591a9637fd487a541ec7db1e6 # bump_19.03 branch
4242
github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f
4343
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
4444
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

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

Lines changed: 6 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_device.go

Lines changed: 19 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)