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

Merge pull request #43813 from thaJeztah/22.06_backport_fix_43781

Browse source 
[22.06 backport] libnetwork: skip firewalld management for rootless
This commit is contained in:
Sebastiaan van Stijn 2022-07-18 09:48:12 +02:00 committed by GitHub
commit c4c8a80958
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libnetwork/iptables/iptables.go
View file

@ -14,6 +14,7 @@ import (
"sync"
"time"
"github.com/docker/docker/rootless"
"github.com/sirupsen/logrus"
)
@ -105,6 +106,12 @@ func probe() {
}
func initFirewalld() {
// When running with RootlessKit, firewalld is running as the root outside our network namespace
// https://github.com/moby/moby/issues/43781
if rootless.RunningWithRootlessKit() {
logrus.Info("skipping firewalld management for rootless mode")
return
}
if err := FirewalldInit(); err != nil {
logrus.Debugf("Fail to initialize firewalld: %v, using raw iptables instead", err)
}