Skip to content

Commit 39c9380

Browse files
authored
Merge pull request #356 from gythialy/feature/golang-v1.23.5
feat: bump golang to 1.23.5
2 parents af2ca4d + 97e9c09 commit 39c9380

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/builder.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on:
55
inputs:
66
builder-tag:
77
description: golang cross builder tag name
8-
default: v1.23.4-0
8+
default: v1.23.5-0
99
golang-version:
1010
description: golang version
11-
default: "1.23.4"
11+
default: "1.23.5"
1212
osxcross-git-hash:
1313
description: git commit hash of osx-cross project
1414
default: "ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b"

Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG OS_CODENAME=bookworm
22

3-
FROM ghcr.io/gythialy/golang-cross-builder:v1.23.4-0-${OS_CODENAME:-bookworm}
3+
FROM ghcr.io/gythialy/golang-cross-builder:v1.23.5-0-${OS_CODENAME:-bookworm}
44

55
LABEL maintainer="Goren G<gythialy.koo+github@gmail.com>"
66
LABEL org.opencontainers.image.source https://github.com/gythialy/golang-cross
@@ -19,8 +19,8 @@ RUN \
1919
cosign version
2020

2121
# install syft
22-
ARG SYFT_VERSION=v1.17.0
23-
ARG SYFT_SHA=3485e831c21fd80b41fa3fc1f72e10367989b2d1aee082d642b5b0e658a02b44
22+
ARG SYFT_VERSION=v1.18.1
23+
ARG SYFT_SHA=066c251652221e4d44fcc4d115ce3df33a91769da38c830a8533199db2f65aab
2424
RUN \
2525
SYFT_DOWNLOAD_FILE=syft_${SYFT_VERSION#v}_linux_amd64.tar.gz && \
2626
SYFT_DOWNLOAD_URL=https://github.com/anchore/syft/releases/download/${SYFT_VERSION}/${SYFT_DOWNLOAD_FILE} && \
@@ -29,8 +29,8 @@ RUN \
2929
tar -xzf $SYFT_DOWNLOAD_FILE -C /usr/bin/ syft && \
3030
rm $SYFT_DOWNLOAD_FILE
3131

32-
ARG GO_VERSION=go1.23.4
33-
ARG GOLANG_DIST_SHA=6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971
32+
ARG GO_VERSION=go1.23.5
33+
ARG GOLANG_DIST_SHA=cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091
3434
# update golang
3535
RUN \
3636
GOLANG_DIST=https://storage.googleapis.com/golang/${GO_VERSION}.linux-amd64.tar.gz && \
@@ -42,8 +42,8 @@ RUN \
4242
go version
4343

4444
# install goreleaser
45-
ARG GORELEASER_VERSION=v2.4.8
46-
ARG GORELEASER_SHA=a115c78edc90d0eb5d36272c54a8087c0b209644349f3e720e2ec53d48d77647
45+
ARG GORELEASER_VERSION=v2.5.1
46+
ARG GORELEASER_SHA=dfdbde64f57a7667bdcf5906c5df8ceaf19fb3175c1b352534ed22ca78b7a4c7
4747
# RUN \
4848
# wget https://github.com/goreleaser/goreleaser/releases/download/$GORELEASER_VERSION/checksums.txt.pem && \
4949
# cosign verify-blob --certificate checksums.txt.pem --signature https://github.com/goreleaser/goreleaser/releases/download/$GORELEASER_VERSION/checksums.txt.sig https://github.com/goreleaser/goreleaser/releases/download/$GORELEASER_VERSION/checksums.txt && \
@@ -95,8 +95,8 @@ RUN \
9595
docker -v
9696

9797
# install Buildx
98-
ARG BUILDX_VERSION=v0.19.1
99-
ARG BUILDX_SHA=153eace3d30c9efe9a7b94ea06c9d15ace59c8e6268d3481b8c175bd3df020f9
98+
ARG BUILDX_VERSION=v0.19.3
99+
ARG BUILDX_SHA=32ed111e941e385c2fb8261eba06a4056915718fd606f8278834ac1931d261a2
100100
RUN \
101101
BUILDX_DOWNLOAD_FILE=buildx-${BUILDX_VERSION}.linux-amd64 && \
102102
wget https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64 && \
@@ -106,8 +106,8 @@ RUN \
106106
mv buildx-${BUILDX_VERSION}.linux-amd64 ~/.docker/cli-plugins/docker-buildx
107107

108108
# install Pack CLI
109-
ARG PACK_VERSION=v0.36.0
110-
ARG PACK_SHA=42324ccbf29a6c6a64533ffe547fb1bbc0b73d741c6b2b7bee5cb9ed2bbf40b2
109+
ARG PACK_VERSION=v0.36.3
110+
ARG PACK_SHA=29529dbd4c4b7575f246c0efc1a64af2c441b069616788372e35f890a111fe03
111111
RUN \
112112
PACK_DOWNLOAD_FILE=pack-${PACK_VERSION}-linux.tgz && \
113113
wget https://github.com/buildpacks/pack/releases/download/${PACK_VERSION}/pack-${PACK_VERSION}-linux.tgz && \

Dockerfile.builder

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# golang parameters
2-
ARG GO_VERSION=1.23.4
2+
ARG GO_VERSION=1.23.5
33
ARG OS_CODENAME=bookworm
44
ARG OSK_SDK=macos-13
55

66
FROM ghcr.io/gythialy/osx-sdk:${OSK_SDK:-macos-13} AS osx-sdk
77

8-
FROM golang:${GO_VERSION:-1.23.4}-${OS_CODENAME:-bookworm} AS base
8+
FROM golang:${GO_VERSION:-1.23.5}-${OS_CODENAME:-bookworm} AS base
99

1010
# osxcross parameters
1111
ARG OSX_VERSION_MIN=10.13

0 commit comments

Comments
 (0)