Skip to content

Commit 8cf2863

Browse files
committed
add iptables option to the docker daemon
1 parent a842dfe commit 8cf2863

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

cmd/drone-docker/main.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ func main() {
104104
Usage: "docker daemon executes in debug mode",
105105
EnvVar: "PLUGIN_DEBUG,DOCKER_LAUNCH_DEBUG",
106106
},
107+
cli.BoolFlag{
108+
Name: "daemon.iptables",
109+
Usage: "docker daemon disable addition of iptables rules if set to true. Default false",
110+
EnvVar: "PLUGIN_IPTABLES_OFF",
111+
},
107112
cli.BoolFlag{
108113
Name: "daemon.off",
109114
Usage: "don't start the docker daemon",
@@ -321,6 +326,7 @@ func run(c *cli.Context) error {
321326
Insecure: c.Bool("daemon.insecure"),
322327
Disabled: c.Bool("daemon.off"),
323328
IPv6: c.Bool("daemon.ipv6"),
329+
IPTablesOff: c.Bool("daemon.iptables"),
324330
Debug: c.Bool("daemon.debug"),
325331
Bip: c.String("daemon.bip"),
326332
DNS: c.StringSlice("daemon.dns"),

docker.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ type (
2323
Debug bool // Docker daemon started in debug mode
2424
Bip string // Docker daemon network bridge IP address
2525
DNS []string // Docker daemon dns server
26+
IPTablesOff bool // docker daemon enable/disable addition of iptables rules
2627
DNSSearch []string // Docker daemon dns search domain
2728
MTU string // Docker daemon mtu setting
2829
IPv6 bool // Docker daemon IPv6 networking
@@ -482,6 +483,9 @@ func commandDaemon(daemon Daemon) *exec.Cmd {
482483
if daemon.Experimental {
483484
args = append(args, "--experimental")
484485
}
486+
if daemon.IPTablesOff {
487+
args = append(args, "--iptables=false")
488+
}
485489
return exec.Command(dockerdExe, args...)
486490
}
487491

0 commit comments

Comments
 (0)