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

Commit adfac69

Browse files
authored
Merge pull request #404 from thaJeztah/19.03_revert_iptables_check2
[19.03 backport] revert controller: Check if IPTables is enabled for arrangeUserFilterRule ENGCORE-1114
2 parents 5787ef7 + 54a5876 commit adfac69

File tree

3 files changed

+4
-34
lines changed

3 files changed

+4
-34
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=45c710223c5fbf04dc3028b9a90b51892e36ca7f
6+
LIBNETWORK_COMMIT=3eb39382bfa6a3c42f83674ab080ae13b0e34e5d # bump_19.03 branch
77

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

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 45c710223c5fbf04dc3028b9a90b51892e36ca7f
41+
github.com/docker/libnetwork 3eb39382bfa6a3c42f83674ab080ae13b0e34e5d # bump_19.03 branch
4242
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
4343
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
4444
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

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

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

0 commit comments

Comments
 (0)