Skip to content

Commit 2a11a08

Browse files
authored
Merge pull request #369 from cpanato/update-go123
bump to use go1.23.11 and bump tools
2 parents 4cefdef + ecdf0ec commit 2a11a08

File tree

4 files changed

+15
-15
lines changed

4 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.10-0
8+
default: v1.23.11-0
99
golang-version:
1010
description: golang version
11-
default: "1.23.10"
11+
default: "1.23.11"
1212
osxcross-git-hash:
1313
description: git commit hash of osx-cross project
1414
default: "ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b"

.github/workflows/dockerimage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Docker Image CI
33
on:
44
push:
55
branches:
6-
- main
6+
- go-1.23
77
pull_request:
88
branches:
9-
- main
9+
- go-1.23
1010

1111
jobs:
1212

Dockerfile

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

3-
FROM ghcr.io/gythialy/golang-cross-builder:v1.23.10-0-${OS_CODENAME:-bookworm}
3+
FROM ghcr.io/gythialy/golang-cross-builder:v1.23.11-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
77

88
COPY entrypoint.sh /
99

1010
# install cosign
11-
ARG COSIGN_VERSION=v2.5.0
12-
ARG COSIGN_SHA=1f6c194dd0891eb345b436bb71ff9f996768355f5e0ce02dde88567029ac2188
11+
ARG COSIGN_VERSION=v2.5.2
12+
ARG COSIGN_SHA=bcfeae05557a9f313ee4392d2f335d0ff69ebbfd232019e3736fb04999fe1734
1313
RUN \
1414
COSIGN_DOWNLOAD_FILE=cosign-linux-amd64 && \
1515
wget -O $COSIGN_DOWNLOAD_FILE https://github.com/sigstore/cosign/releases/download/${COSIGN_VERSION}/${COSIGN_DOWNLOAD_FILE} && \
@@ -19,8 +19,8 @@ RUN \
1919
cosign version
2020

2121
# install syft
22-
ARG SYFT_VERSION=v1.23.1
23-
ARG SYFT_SHA=42f3e01b64f054d0caee42073cb94e3ac3e61be6f0100e7ecda96e6a2abf7e22
22+
ARG SYFT_VERSION=v1.28.0
23+
ARG SYFT_SHA=3edee7fe1ceb1f78360e547f57048930d57f00c7ec3d0b8bdfb902805f048468
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.10
33-
ARG GOLANG_DIST_SHA=535f9f81802499f2a7dbfa70abb8fda3793725fcc29460f719815f6e10b5fd60
32+
ARG GO_VERSION=go1.23.11
33+
ARG GOLANG_DIST_SHA=80899df77459e0b551d2eb8800ad6eb47023b99cccbf8129e7b5786770b948c5
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.9.0
46-
ARG GORELEASER_SHA=a066fcd713684abed0d750d7559f1a5d794fa2faa8e8f1ad2eecec8c373668a7
45+
ARG GORELEASER_VERSION=v2.11.0
46+
ARG GORELEASER_SHA=da8383cb2e1e848372a337922333ec883b8607c2ba70a2a68a0f33022fb7ebfd
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 && \

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.10
2+
ARG GO_VERSION=1.23.11
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.10}-${OS_CODENAME:-bookworm} AS base
8+
FROM golang:${GO_VERSION:-1.23.11}-${OS_CODENAME:-bookworm} AS base
99

1010
# osxcross parameters
1111
ARG OSX_VERSION_MIN=10.13

0 commit comments

Comments
 (0)