Skip to content

Commit 47475eb

Browse files
authored
Merge pull request #332 from cpanato/update-go122
build with go1.22.7 for branch go-1.22
2 parents 8f00da3 + 1dde7ba commit 47475eb

File tree

4 files changed

+10
-8
lines changed

4 files changed

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

.github/workflows/dockerimage.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ on:
44
push:
55
branches:
66
- main
7+
- go-1.22
78
pull_request:
89
branches:
910
- main
11+
- go-1.22
1012

1113
jobs:
1214

Dockerfile

Lines changed: 4 additions & 4 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.22.6-0-${OS_CODENAME:-bookworm}
3+
FROM ghcr.io/gythialy/golang-cross-builder:v1.22.7-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
@@ -10,7 +10,7 @@ COPY entrypoint.sh /
1010
# install cosign
1111
ARG COSIGN_VERSION=v2.4.0
1212
ARG COSIGN_SHA=cd7636b3586a3bdac2d9c8f3b421ed119edcb20499107887fd929211110e8418
13-
RUN \
13+
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} && \
1616
echo "$COSIGN_SHA $COSIGN_DOWNLOAD_FILE" | sha256sum -c - || exit 1 && \
@@ -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.22.6
33-
ARG GOLANG_DIST_SHA=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616
32+
ARG GO_VERSION=go1.22.7
33+
ARG GOLANG_DIST_SHA=fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb
3434
# update golang
3535
RUN \
3636
GOLANG_DIST=https://storage.googleapis.com/golang/${GO_VERSION}.linux-amd64.tar.gz && \

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

1010
# osxcross parameters
1111
ARG OSX_VERSION_MIN=10.13

0 commit comments

Comments
 (0)