diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 807a027..dbddd6a 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -5,10 +5,10 @@ on: inputs: builder-tag: description: golang cross builder tag name - default: v1.22.6-0 + default: v1.22.7-0 golang-version: description: golang version - default: "1.22.6" + default: "1.22.7" osxcross-git-hash: description: git commit hash of osx-cross project default: "ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b" diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index afc48be..f86315f 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -4,9 +4,11 @@ on: push: branches: - main + - go-1.22 pull_request: branches: - main + - go-1.22 jobs: diff --git a/Dockerfile b/Dockerfile index f13fe57..54759d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG OS_CODENAME=bookworm -FROM ghcr.io/gythialy/golang-cross-builder:v1.22.6-0-${OS_CODENAME:-bookworm} +FROM ghcr.io/gythialy/golang-cross-builder:v1.22.7-0-${OS_CODENAME:-bookworm} LABEL maintainer="Goren G" LABEL org.opencontainers.image.source https://github.com/gythialy/golang-cross @@ -10,7 +10,7 @@ COPY entrypoint.sh / # install cosign ARG COSIGN_VERSION=v2.4.0 ARG COSIGN_SHA=cd7636b3586a3bdac2d9c8f3b421ed119edcb20499107887fd929211110e8418 -RUN \ +RUN \ COSIGN_DOWNLOAD_FILE=cosign-linux-amd64 && \ wget -O $COSIGN_DOWNLOAD_FILE https://github.com/sigstore/cosign/releases/download/${COSIGN_VERSION}/${COSIGN_DOWNLOAD_FILE} && \ echo "$COSIGN_SHA $COSIGN_DOWNLOAD_FILE" | sha256sum -c - || exit 1 && \ @@ -29,8 +29,8 @@ RUN \ tar -xzf $SYFT_DOWNLOAD_FILE -C /usr/bin/ syft && \ rm $SYFT_DOWNLOAD_FILE -ARG GO_VERSION=go1.22.6 -ARG GOLANG_DIST_SHA=999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616 +ARG GO_VERSION=go1.22.7 +ARG GOLANG_DIST_SHA=fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb # update golang RUN \ GOLANG_DIST=https://storage.googleapis.com/golang/${GO_VERSION}.linux-amd64.tar.gz && \ diff --git a/Dockerfile.builder b/Dockerfile.builder index a89fca0..9e19891 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -1,11 +1,11 @@ # golang parameters -ARG GO_VERSION=1.22.6 +ARG GO_VERSION=1.22.7 ARG OS_CODENAME=bookworm ARG OSK_SDK=macos-13 FROM ghcr.io/gythialy/osx-sdk:${OSK_SDK:-macos-13} AS osx-sdk -FROM golang:${GO_VERSION:-1.22.6}-${OS_CODENAME:-bookworm} AS base +FROM golang:${GO_VERSION:-1.22.7}-${OS_CODENAME:-bookworm} AS base # osxcross parameters ARG OSX_VERSION_MIN=10.13