Merge pull request #278 from estesp/update-go

Update Go and Alpine versions
estesp · Dec 12, 2024 · 8f23245 · 8f23245
2 parents d36059c + c6537ce
commit 8f23245
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.23.3]
+        go-version: [1.23.4]
         os: [ubuntu-22.04, macos-14, windows-2019]
 
     steps:
@@ -62,7 +62,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.3'
+          go-version: '1.23.4'
 
       - name: Set env
         shell: bash
@@ -107,7 +107,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23.3'
+          go-version: '1.23.4'
 
       - name: Set env
         shell: bash
@@ -137,7 +137,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23.3'
+          go-version: '1.23.4'
 
       - name: Set env
         shell: bash
@@ -182,7 +182,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23.3'
+          go-version: '1.23.4'
 
       - name: Set env
         shell: bash

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.3'
+          go-version: '1.23.4'
 
       - name: Set env
         shell: bash
@@ -151,7 +151,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.3'
+          go-version: '1.23.4'
 
       - name: Set env
         shell: bash
@@ -195,7 +195,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23.3'
+          go-version: '1.23.4'
 
       - name: Set env
         shell: bash

diff --git a/hack/Dockerfile.alpine b/hack/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.23.3-alpine AS bld
+FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine AS bld
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETVARIANT
@@ -27,7 +27,7 @@ WORKDIR /manifest-tool
 COPY  . /manifest-tool
 RUN /manifest-tool/hack/makestatic.sh $TARGETARCH ${TARGETVARIANT#v}
 
-FROM --platform=$TARGETPLATFORM alpine:3.20.3
+FROM --platform=$TARGETPLATFORM alpine:3.21.0
 COPY --from=bld /manifest-tool/manifest-tool /manifest-tool
 COPY --from=bld /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=bld --chown=0:0 /go/bin/docker-credential-gcr /usr/bin/docker-credential-gcloud

diff --git a/hack/Dockerfile.linux b/hack/Dockerfile.linux
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.23.3-alpine AS bld
+FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine AS bld
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETVARIANT