Skip to content

Commit ab2af9b

Browse files
authored
Add patch version to go.mod for 'Scheduled govulncheck' (#3653)
* add patch version to go.mod for 'Scheduled govulncheck' * update Dockerfile * fix Dockerfile * backport e2e-test fix
1 parent 24949da commit ab2af9b

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/e2e-tests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
8282
- name: package cleanup
8383
uses: dataaxiom/ghcr-cleanup-action@v1
84+
continue-on-error: true # action doesn't fail when this step fails
8485
if: ${{ github.actor != 'dependabot' }}
8586
with:
8687
owner: nuts-foundation
@@ -91,6 +92,7 @@ jobs:
9192

9293
- name: package cleanup dependabot
9394
uses: dataaxiom/ghcr-cleanup-action@v1
95+
continue-on-error: true # action doesn't fail when this step fails
9496
if: ${{ github.actor == 'dependabot' }}
9597
with:
9698
owner: nuts-foundation

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# golang alpine
2-
FROM golang:1.23.2-alpine AS builder
2+
FROM golang:1.23.4-alpine AS builder
33

44
ARG TARGETARCH
55
ARG TARGETOS
@@ -28,12 +28,11 @@ COPY . .
2828
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
2929

3030
# alpine
31-
FROM alpine:3.20.3
31+
FROM alpine:3.21.2
3232
RUN apk update \
3333
&& apk add --no-cache \
3434
tzdata \
35-
curl \
36-
&& update-ca-certificates
35+
curl
3736
COPY --from=builder /opt/nuts/nuts /usr/bin/nuts
3837

3938
HEALTHCHECK --start-period=30s --timeout=5s --interval=10s \

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/nuts-foundation/nuts-node
22

3-
go 1.23
3+
// This is the minimal version, the actual go version is determined by the images in the Dockerfile
4+
// This version is used in automated tests such as the 'Scheduled govulncheck' action
5+
go 1.23.4
46

57
require (
68
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0

0 commit comments

Comments
 (0)