Enable IPv6 on compose networks where enable_ipv6 is true

darktohka · darktohka · commit 59a7b2580f40 · 2024-11-21T20:37:35.000+02:00
Signed-off-by: Derzsi Dániel &lt;daniel@tohka.us&gt;
diff --git a/pkg/composer/up_network.go b/pkg/composer/up_network.go
@@ -36,7 +36,7 @@ func (c *Composer) upNetwork(ctx context.Context, shortName string) error {
 		return nil
 	}
 
-	if unknown := reflectutil.UnknownNonEmptyFields(&net, "Name", "Ipam", "Driver", "DriverOpts"); len(unknown) > 0 {
+	if unknown := reflectutil.UnknownNonEmptyFields(&net, "Name", "Ipam", "Driver", "DriverOpts", "EnableIPv6"); len(unknown) > 0 {
 		log.G(ctx).Warnf("Ignoring: network %s: %+v", shortName, unknown)
 	}
 
@@ -83,6 +83,10 @@ func (c *Composer) upNetwork(ctx context.Context, shortName string) error {
 			}
 		}
 
+		if *net.EnableIPv6 {
+			createArgs = append(createArgs, "--ipv6")
+		}
+
 		createArgs = append(createArgs, fullName)
 
 		if c.DebugPrintFull {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func (c *Composer) upNetwork(ctx context.Context, shortName string) error {`
`36`	`36`	`return nil`
`37`	`37`	`}`
`38`	`38`
`39`		`- if unknown := reflectutil.UnknownNonEmptyFields(&net, "Name", "Ipam", "Driver", "DriverOpts"); len(unknown) > 0 {`
	`39`	`+ if unknown := reflectutil.UnknownNonEmptyFields(&net, "Name", "Ipam", "Driver", "DriverOpts", "EnableIPv6"); len(unknown) > 0 {`
`40`	`40`	`log.G(ctx).Warnf("Ignoring: network %s: %+v", shortName, unknown)`
`41`	`41`	`}`
`42`	`42`
`@@ -83,6 +83,10 @@ func (c *Composer) upNetwork(ctx context.Context, shortName string) error {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ if *net.EnableIPv6 {`
	`87`	`+ createArgs = append(createArgs, "--ipv6")`
	`88`	`+ }`
	`89`	`+`
`86`	`90`	`createArgs = append(createArgs, fullName)`
`87`	`91`
`88`	`92`	`if c.DebugPrintFull {`