Merge branch 'main' into bump-go-version

tma · Jul 8, 2024 · 5b2436b · 5b2436b
2 parents 4e9ed6d + 0fa59d3
commit 5b2436b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -66,7 +66,7 @@ jobs:
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ env.BUILD_TYPE == 'release' }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.22.3-bullseye AS builder-base
+FROM --platform=$BUILDPLATFORM golang:1.22.5-bullseye AS builder-base
 
 ARG TARGETOS TARGETARCH