Skip to content

Commit 8f23245

Browse files
authored
Merge pull request #278 from estesp/update-go
Update Go and Alpine versions
2 parents d36059c + c6537ce commit 8f23245

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
go-version: [1.23.3]
23+
go-version: [1.23.4]
2424
os: [ubuntu-22.04, macos-14, windows-2019]
2525

2626
steps:
@@ -62,7 +62,7 @@ jobs:
6262
- name: Set up Go
6363
uses: actions/setup-go@v5
6464
with:
65-
go-version: '1.23.3'
65+
go-version: '1.23.4'
6666

6767
- name: Set env
6868
shell: bash
@@ -107,7 +107,7 @@ jobs:
107107
steps:
108108
- uses: actions/setup-go@v5
109109
with:
110-
go-version: '1.23.3'
110+
go-version: '1.23.4'
111111

112112
- name: Set env
113113
shell: bash
@@ -137,7 +137,7 @@ jobs:
137137
steps:
138138
- uses: actions/setup-go@v5
139139
with:
140-
go-version: '1.23.3'
140+
go-version: '1.23.4'
141141

142142
- name: Set env
143143
shell: bash
@@ -182,7 +182,7 @@ jobs:
182182
steps:
183183
- uses: actions/setup-go@v5
184184
with:
185-
go-version: '1.23.3'
185+
go-version: '1.23.4'
186186

187187
- name: Set env
188188
shell: bash

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Install Go
5959
uses: actions/setup-go@v5
6060
with:
61-
go-version: '1.23.3'
61+
go-version: '1.23.4'
6262

6363
- name: Set env
6464
shell: bash
@@ -151,7 +151,7 @@ jobs:
151151
- name: Install Go
152152
uses: actions/setup-go@v5
153153
with:
154-
go-version: '1.23.3'
154+
go-version: '1.23.4'
155155

156156
- name: Set env
157157
shell: bash
@@ -195,7 +195,7 @@ jobs:
195195
- name: Install Go
196196
uses: actions/setup-go@v5
197197
with:
198-
go-version: '1.23.3'
198+
go-version: '1.23.4'
199199

200200
- name: Set env
201201
shell: bash

hack/Dockerfile.alpine

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.23.3-alpine AS bld
1+
FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine AS bld
22
ARG TARGETPLATFORM
33
ARG TARGETARCH
44
ARG TARGETVARIANT
@@ -27,7 +27,7 @@ WORKDIR /manifest-tool
2727
COPY . /manifest-tool
2828
RUN /manifest-tool/hack/makestatic.sh $TARGETARCH ${TARGETVARIANT#v}
2929

30-
FROM --platform=$TARGETPLATFORM alpine:3.20.3
30+
FROM --platform=$TARGETPLATFORM alpine:3.21.0
3131
COPY --from=bld /manifest-tool/manifest-tool /manifest-tool
3232
COPY --from=bld /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
3333
COPY --from=bld --chown=0:0 /go/bin/docker-credential-gcr /usr/bin/docker-credential-gcloud

hack/Dockerfile.linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.23.3-alpine AS bld
1+
FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine AS bld
22
ARG TARGETPLATFORM
33
ARG TARGETARCH
44
ARG TARGETVARIANT

0 commit comments

Comments
 (0)