Merge pull request 'chore(deps): update dependency docker.io/library/golang to v1.21.0' (#6) from renovate/docker.io-library-golang-1.x into master

Reviewed-on: #6

.drone.yml

@@ -49,6 +49,87 @@ trigger:
     exclude:
     - tag
 
+---
+kind: pipeline
+type: docker
+name: unit-test-amd64
+
+clone:
+  disable: true
+
+platform:
+  arch: amd64
+
+steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.2.1
+
+- name: unit-test
+  commands:
+  - go test -v ./...
+  image: docker.io/library/golang:1.21.0
+
+trigger:
+  event:
+    exclude:
+    - tag
+
+---
+kind: pipeline
+type: docker
+name: unit-test-arm-v7
+
+clone:
+  disable: true
+
+platform:
+  arch: arm
+
+steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.2.1
+
+- name: unit-test
+  commands:
+  - go test -v ./...
+  image: docker.io/library/golang:1.21.0
+
+trigger:
+  event:
+    include:
+    - pull_request
+    - push
+    exclude:
+    - tag
+
+---
+kind: pipeline
+type: docker
+name: unit-test-arm64
+
+clone:
+  disable: true
+
+platform:
+  arch: arm64
+
+steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.2.1
+
+- name: unit-test
+  commands:
+  - go test -v ./...
+  image: docker.io/library/golang:1.21.0
+
+trigger:
+  event:
+    include:
+    - pull_request
+    - push
+    exclude:
+    - tag
+
 ---
 kind: pipeline
 type: docker
@@ -59,6 +140,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-amd64
 
 platform:
   os: linux
@@ -125,6 +207,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-arm-v7
 
 platform:
   os: linux
@@ -191,6 +274,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-arm64
 
 platform:
   os: linux
@@ -257,6 +341,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-amd64
 
 platform:
   os: linux
@@ -321,6 +406,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-arm-v7
 
 platform:
   os: linux
@@ -385,6 +471,7 @@ clone:
 
 depends_on:
 - linter
+- unit-test-arm64
 
 platform:
   os: linux
@@ -530,7 +617,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.13.0
+  image: quay.io/skopeo/stable:v1.13.1
 
 - name: email-notification
   environment:
@@ -831,7 +918,7 @@ steps:
       from_secret: container_image_registry_user
     DEST_CRED_PASSWORD:
       from_secret: container_image_registry_password
-  image: quay.io/skopeo/stable:v1.13.0
+  image: quay.io/skopeo/stable:v1.13.1
 
 - name: email-notification
   environment:

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.20.6-alpine3.18 AS build
+FROM docker.io/library/golang:1.21.0-alpine3.18 AS build
 
 RUN apk add git make
 
@@ -10,7 +10,7 @@ RUN make install \
       PREFIX=/usr \
       VERSION=${VERSION}
 
-FROM docker.io/library/alpine:3.18.2
+FROM docker.io/library/alpine:3.18.3
 
 COPY --from=build /cache /
 

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{