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

Commit c416072

Browse files
authored
Merge pull request #330 from thaJeztah/19.03_backport_bump_libnetwork
[19.03 backport] bump libnetwork to 92d1fbe1eb0883cf11d283cea8e658275146411d
2 parents b262d40 + 5196dc6 commit c416072

File tree

310 files changed

+38207
-5102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

310 files changed

+38207
-5102
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=fc5a7d91d54cc98f64fc28f9e288b46a0bee756c
6+
LIBNETWORK_COMMIT=92d1fbe1eb0883cf11d283cea8e658275146411d
77

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

vendor.conf

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/mattn/go-shellwords a72fbe27a1b0ed0df2f027549450
1414
github.com/sirupsen/logrus 8bdbc7bcc01dcbb8ec23dc8a28e332258d25251f # v1.4.1
1515
github.com/tchap/go-patricia a7f0089c6f496e8e70402f61733606daa326cac5 # v2.3.0
1616
github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3 # v0.1.0
17-
golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146
18-
golang.org/x/sys 4b34438f7a67ee5f45cc6132e2bad873a20324e9
17+
golang.org/x/net f3200d17e092c607f615320ecaad13d87ad9a2b3
18+
golang.org/x/sys 4c4f7f33c9ed00de01c4c741d2177abfcfe19307
1919
github.com/docker/go-units 519db1ee28dcc9fd2474ae59fca29a810482bfb1 # v0.4.0
2020
github.com/docker/go-connections 7395e3f8aa162843a74ed6d48e79627d9792ac55 # v0.4.0
2121
golang.org/x/text f21a4dfb5e38f5895301dc265a8def02365cc3d0 # v0.3.0
@@ -39,19 +39,20 @@ 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 fc5a7d91d54cc98f64fc28f9e288b46a0bee756c
42+
github.com/docker/libnetwork 92d1fbe1eb0883cf11d283cea8e658275146411d
4343
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
4444
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
4545
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
4646
github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
4747
github.com/hashicorp/memberlist 3d8438da9589e7b608a83ffac1ef8211486bcb7c
4848
github.com/sean-/seed e2103e2c35297fb7e17febb81e49b312087a2372
49-
github.com/hashicorp/go-sockaddr 6d291a969b86c4b633730bfc6b8b9d64c3aafed9
50-
github.com/hashicorp/go-multierror fcdddc395df1ddf4247c69bd436e84cfa0733f7e
49+
github.com/hashicorp/errwrap 8a6fb523712970c966eefc6b39ed2c5e74880354 # v1.0.0
50+
github.com/hashicorp/go-sockaddr c7188e74f6acae5a989bdc959aa779f8b9f42faf # v1.0.2
51+
github.com/hashicorp/go-multierror 886a7fbe3eb1c874d46f623bfa70af45f425b3d1 # v1.0.0
5152
github.com/hashicorp/serf 598c54895cc5a7b1a24a398d635e8c0ea0959870
5253
github.com/docker/libkv 458977154600b9f23984d9f4b82e79570b5ae12b
53-
github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25
54-
github.com/vishvananda/netlink b2de5d10e38ecce8607e6b438b6d174f389a004e
54+
github.com/vishvananda/netns 7109fa855b0ff1ebef7fbd2f6aa613e8db7cfbc0
55+
github.com/vishvananda/netlink a2ad57a690f3caf3015351d2d6e1c0b95c349752
5556

5657
# When updating, consider updating TOMLV_COMMIT in hack/dockerfile/install/tomlv.installer accordingly
5758
github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 # v0.3.1
@@ -62,8 +63,8 @@ github.com/coreos/go-semver 8ab6407b697782a06568d4b7f1db
6263
github.com/ugorji/go b4c50a2b199d93b13dc15e78929cfb23bfdf21ab # v1.1.1
6364
github.com/hashicorp/consul 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 # v0.5.2
6465
github.com/miekg/dns e57bf427e68187a27e22adceac868350d7a7079b # v1.0.7
65-
github.com/ishidawataru/sctp 07191f837fedd2f13d1ec7b5f885f0f3ec54b1cb
66-
go.etcd.io/bbolt 7ee3ded59d4835e10f3e7d0f7603c42aa5e83820 # v1.3.1-etcd.8
66+
github.com/ishidawataru/sctp 6e2cb1366111dcf547c13531e3a263a067715847
67+
go.etcd.io/bbolt a0458a2b35708eef59eb5f620ceb3cd1c01a824d # v1.3.3
6768

6869
# get graph and distribution packages
6970
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580

vendor/github.com/docker/libnetwork/README.md

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

vendor/github.com/docker/libnetwork/controller.go

Lines changed: 14 additions & 6 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/netlink_deprecated_linux_notarm.go renamed to vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_rawsockaddr_data_int8.go

Lines changed: 1 addition & 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/drivers/bridge/netlink_deprecated_linux_armppc64.go renamed to vendor/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_rawsockaddr_data_uint8.go

Lines changed: 1 addition & 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/drivers/bridge/setup_ip_tables.go

Lines changed: 1 addition & 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/drivers/ipvlan/ipvlan_network.go

Lines changed: 33 additions & 18 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/ipvlan/ipvlan_store.go

Lines changed: 9 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/macvlan/macvlan_network.go

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

0 commit comments

Comments
 (0)