0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2609 from bboehmke/firewalld_passthrough_ipv6

Browse source 
fixed IPv6 iptables rules for enabled firewalld
This commit is contained in:
Arko Dasgupta 2021-01-14 14:48:53 -08:00 • committed by GitHub
commit da68ca912a
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnetwork/iptables/iptables.go
View file

@ -512,8 +512,14 @@ func filterOutput(start time.Time, output []byte, args ...string) []byte {
// Raw calls 'iptables' system command, passing supplied arguments.
func (iptable IPTable) Raw(args ...string) ([]byte, error) {
if firewalldRunning {
// select correct IP version for firewalld
ipv := Iptables
if iptable.Version == IPv6 {
ipv = IP6Tables
}
startTime := time.Now()
output, err := Passthrough(Iptables, args...)
output, err := Passthrough(ipv, args...)
if err == nil || !strings.Contains(err.Error(), "was not provided by any .service files") {
return filterOutput(startTime, output, args...), err
}