add iptables option to the daemon #309
Conversation
cmd/drone-docker/main.go
Outdated
| @@ -103,6 +103,11 @@ func main() { | |||
| Usage: "docker daemon executes in debug mode", | |||
| EnvVar: "PLUGIN_DEBUG,DOCKER_LAUNCH_DEBUG", | |||
| }, | |||
| cli.BoolFlag{ | |||
There was a problem hiding this comment.
change to IPTablesOff since they are on by default, and we want to keep this default value
cmd/drone-docker/main.go
Outdated
| @@ -285,6 +290,7 @@ func run(c *cli.Context) error { | |||
| Disabled: c.Bool("daemon.off"), | |||
| IPv6: c.Bool("daemon.ipv6"), | |||
| Debug: c.Bool("daemon.debug"), | |||
| IPTables: c.Bool("daemon.iptables"), | |||
There was a problem hiding this comment.
rename to IPTablesOff since they are on by default
cmd/drone-docker/main.go
Outdated
| cli.BoolFlag{ | ||
| Name: "daemon.iptables", | ||
| Usage: "docker daemon enable addition of iptables rules", | ||
| EnvVar: "PLUGIN_IPTABLES", |
docker.go
Outdated
| @@ -370,6 +371,9 @@ func commandDaemon(daemon Daemon) *exec.Cmd { | |||
| if daemon.Experimental { | |||
| args = append(args, "--experimental") | |||
| } | |||
| if daemon.IPTables { | |||
There was a problem hiding this comment.
need to verify the flag, but if iptables_off: true then we should disable iptables, which would otherwise be enabled by default
if daemon.IPTablesOff {
args = append(args, "--iptables=false")
}
|
builds are failing not due to these changes . but due to the rate limit issue. if someone could still review and approve this |
|
Why the name like iptables off? The flag could be true by default and the flag only gets appended if it's not true. |
| @@ -103,6 +103,11 @@ func main() { | |||
| Usage: "docker daemon executes in debug mode", | |||
| EnvVar: "PLUGIN_DEBUG,DOCKER_LAUNCH_DEBUG", | |||
| }, | |||
| cli.BoolTFlag{ | |||
There was a problem hiding this comment.
I think this should be Bool instead of BoolT. The BoolT parameter defaults to true if unset, however, in this case I think we want to disable to false and only disable IP tables if the user explicitly sets this value to true
| @@ -103,6 +103,11 @@ func main() { | |||
| Usage: "docker daemon executes in debug mode", | |||
| EnvVar: "PLUGIN_DEBUG,DOCKER_LAUNCH_DEBUG", | |||
| }, | |||
| cli.BoolTFlag{ | |||
| Name: "daemon.iptables", | |||
| Usage: "docker daemon enable addition of iptables rules", | |||
There was a problem hiding this comment.
also consider changing the description to make it clear that this flag disables iptable rules, instead of enabling
|
Have you had a look at implementing @bradrydzewski 's suggested changes and rebasing of master. |
|
Any updates on this? highly needed |
PR is coming from this discussion here : https://discourse.drone.io/t/docker-parallel-build-failing-anyone/8406/6
Adding iptables option as discussed