Only override service mac if set on the main network.

apollo13 · ndeloof · commit 2ebb47543314 · 2025-01-07T16:16:33.000+01:00
Signed-off-by: Florian Apolloner &lt;florian@apolloner.eu&gt;
diff --git a/pkg/compose/create.go b/pkg/compose/create.go
@@ -416,7 +416,7 @@ func (s *composeService) prepareContainerMACAddress(ctx context.Context, service
 			return "", fmt.Errorf("a MAC address is specified for multiple networks (%s), but this feature requires Docker Engine 1.44 or later (currently: %s)", strings.Join(withMacAddress, ", "), version)
 		}
 
-		if mainNw != nil {
+		if mainNw != nil && mainNw.MacAddress != "" {
 			macAddress = mainNw.MacAddress
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ func (s *composeService) prepareContainerMACAddress(ctx context.Context, service`
`416`	`416`	`return "", fmt.Errorf("a MAC address is specified for multiple networks (%s), but this feature requires Docker Engine 1.44 or later (currently: %s)", strings.Join(withMacAddress, ", "), version)`
`417`	`417`	`}`
`418`	`418`
`419`		`- if mainNw != nil {`
	`419`	`+ if mainNw != nil && mainNw.MacAddress != "" {`
`420`	`420`	`macAddress = mainNw.MacAddress`
`421`	`421`	`}`
`422`	`422`	`}`