Merge branch 'main' into dependabot/go_modules/github.com/onsi/gomega…

…-1.35.1
kartverket · Nov 4, 2024 · e4b6d96 · e4b6d96
2 parents 2f81854 + 4e6c899
commit e4b6d96
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Golang environment
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       - name: Log in to the Container registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 as builder
 RUN adduser -u 10001 scratchuser
 
 FROM scratch

diff --git a/local_testing/Dockerfile b/local_testing/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21
+FROM golang:1.23
 
 WORKDIR /app
 COPY go.mod go.sum ./