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 diff --git a/Dockerfile b/Dockerfile index 55ef226f5d..8eedf22d59 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,12 +28,11 @@ 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 \ - curl \ - && update-ca-certificates + curl COPY --from=builder /opt/nuts/nuts /usr/bin/nuts HEALTHCHECK --start-period=30s --timeout=5s --interval=10s \ 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