PapaTutuWawa/woodpecker-docker-buildx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85 from kmlebedev/master

Browse Source 
IPv6 networking
This commit is contained in:
Thomas Boerger 2016-10-11 15:34:07 +02:00 committed by GitHub
commit 4889aa9eb9
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@ -65,6 +65,11 @@ func main() {
Usage: "docker daemon allows insecure registries", Usage: "docker daemon allows insecure registries",
EnvVar: "PLUGIN_INSECURE", EnvVar: "PLUGIN_INSECURE",
}, },
cli.BoolFlag{
Name: "daemon.ipv6",
Usage: "docker daemon IPv6 networking",
EnvVar: "PLUGIN_IPV6",
},
cli.BoolFlag{ cli.BoolFlag{
Name: "daemon.debug", Name: "daemon.debug",
Usage: "docker daemon executes in debug mode", Usage: "docker daemon executes in debug mode",
@ -163,6 +168,7 @@ func run(c *cli.Context) error {
StoragePath: c.String("daemon.storage-path"), StoragePath: c.String("daemon.storage-path"),
Insecure: c.Bool("daemon.insecure"), Insecure: c.Bool("daemon.insecure"),
Disabled: c.Bool("daemon.off"), Disabled: c.Bool("daemon.off"),
IPv6: c.Bool("daemon.ipv6"),
Debug: c.Bool("daemon.debug"), Debug: c.Bool("daemon.debug"),
Bip: c.String("daemon.bip"), Bip: c.String("daemon.bip"),
DNS: c.StringSlice("daemon.dns"), DNS: c.StringSlice("daemon.dns"),

4
plugin.go
View File

@ -27,6 +27,7 @@ type (
Bip string // Docker daemon network bridge IP address Bip string // Docker daemon network bridge IP address
DNS []string // Docker daemon dns server DNS []string // Docker daemon dns server
MTU string // Docker daemon mtu setting MTU string // Docker daemon mtu setting
IPv6 bool // Docker daemon IPv6 networking
} }
// Login defines Docker login parameters. // Login defines Docker login parameters.
@ -213,6 +214,9 @@ func commandDaemon(daemon Daemon) *exec.Cmd {
if daemon.Insecure && daemon.Registry != "" { if daemon.Insecure && daemon.Registry != "" {
args = append(args, "--insecure-registry", daemon.Registry) args = append(args, "--insecure-registry", daemon.Registry)
} }
if daemon.IPv6 {
args = append(args, "--ipv6")
}
if len(daemon.Mirror) != 0 { if len(daemon.Mirror) != 0 {
args = append(args, "--registry-mirror", daemon.Mirror) args = append(args, "--registry-mirror", daemon.Mirror)
} }