fix(dockerCompose): mergeLastWinImage

pkg/domain/dockerCompose/config.go

@@ -490,10 +490,19 @@ func (s *Service) mergeLastWinEnvironments(environments []string) {
 }
 
 func (s *Service) mergeLastWinImage(image string) {
+	switch {
+	case len(s.Image) == 0 && len(image) != 0:
+		s.Image = image
+	case len(s.Image) != 0 && len(image) == 0:
+		fallthrough
+	case len(s.Image) == 0 && len(image) == 0:
+		return
+	default:
 		if s.Image != image {
 			s.Image = image
 		}
 	}
+}
 
 func (s *Service) mergeLastWinExtraHosts(extraHosts []string) {
 	for _, extraHost := range extraHosts {

pkg/domain/dockerCompose/config_test.go

@@ -735,6 +735,41 @@ func TestService_MergeLastWin(t *testing.T) {
 			},
 		},
 
+		// Image
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Image: "",
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Image: "",
+			},
+			expectedService: &dockerCompose.Service{
+				Image: "",
+			},
+		},
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Image: "HelloWorld",
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Image: "FooBar",
+			},
+			expectedService: &dockerCompose.Service{
+				Image: "FooBar",
+			},
+		},
+		{
+			serviceDeploymentA: &dockerCompose.Service{
+				Image: "HelloWorld",
+			},
+			serviceDeploymentB: &dockerCompose.Service{
+				Image: "",
+			},
+			expectedService: &dockerCompose.Service{
+				Image: "HelloWorld",
+			},
+		},
+
 		// Labels
 		{
 			serviceDeploymentA: &dockerCompose.Service{