From e4a83e5d32d1683edeec2990d0ebbb4f6955d37c Mon Sep 17 00:00:00 2001
From: Gerard Snaauw <gerard.snaauw@nedap.com>
Date: Mon, 13 Jan 2025 12:25:23 +0100
Subject: [PATCH 1/4] add patch version to go.mod for 'Scheduled govulncheck'

---
 go.mod | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 50e04da01f..ec04c3fdf0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,8 @@
 module github.com/nuts-foundation/nuts-node
 
-go 1.23
+// This is the minimal version, the actual go version is determined by the images in the Dockerfile
+// This version is used in automated tests such as the 'Scheduled govulncheck' action
+go 1.23.4
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0

From eda1ebdd83da7a36ce1c24d7dc790d5088093223 Mon Sep 17 00:00:00 2001
From: Gerard Snaauw <gerard.snaauw@nedap.com>
Date: Mon, 13 Jan 2025 13:01:08 +0100
Subject: [PATCH 2/4] update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 55ef226f5d..2b8f2670e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # golang alpine
-FROM golang:1.23.2-alpine AS builder
+FROM golang:1.23.4-alpine AS builder
 
 ARG TARGETARCH
 ARG TARGETOS
@@ -28,7 +28,7 @@ COPY . .
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/core.GitVersion=${GIT_VERSION}'" -o /opt/nuts/nuts
 
 # alpine
-FROM alpine:3.20.3
+FROM alpine:3.21.2
 RUN apk update \
   && apk add --no-cache \
              tzdata \

From 7a38b25c36b20104948266e0a482bbceb2540b4a Mon Sep 17 00:00:00 2001
From: Gerard Snaauw <gerard.snaauw@nedap.com>
Date: Mon, 13 Jan 2025 13:14:56 +0100
Subject: [PATCH 3/4] fix Dockerfile

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2b8f2670e4..8eedf22d59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,8 +32,7 @@ FROM alpine:3.21.2
 RUN apk update \
   && apk add --no-cache \
              tzdata \
-             curl \
-  && update-ca-certificates
+             curl
 COPY --from=builder /opt/nuts/nuts /usr/bin/nuts
 
 HEALTHCHECK --start-period=30s --timeout=5s --interval=10s \

From f36dfe389fa185a481ee6004120eef4c637ef45c Mon Sep 17 00:00:00 2001
From: Gerard Snaauw <gerard.snaauw@nedap.com>
Date: Mon, 13 Jan 2025 13:18:47 +0100
Subject: [PATCH 4/4] backport e2e-test fix

---
 .github/workflows/e2e-tests.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index 91ecbd7d38..7654ebdf03 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -81,6 +81,7 @@ jobs:
 
       - name: package cleanup
         uses: dataaxiom/ghcr-cleanup-action@v1
+        continue-on-error: true # action doesn't fail when this step fails
         if: ${{ github.actor != 'dependabot' }}
         with:
           owner: nuts-foundation
@@ -91,6 +92,7 @@ jobs:
 
       - name: package cleanup dependabot
         uses: dataaxiom/ghcr-cleanup-action@v1
+        continue-on-error: true # action doesn't fail when this step fails
         if: ${{ github.actor == 'dependabot' }}
         with:
           owner: nuts-foundation