Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:
inputs:
builder-tag:
description: golang cross builder tag name
default: v1.24.0-0
default: v1.24.1-0
golang-version:
description: golang version
default: "1.24.0"
default: "1.24.1"
osxcross-git-hash:
description: git commit hash of osx-cross project
default: "ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b"
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ARG OS_CODENAME=bookworm

FROM ghcr.io/gythialy/golang-cross-builder:v1.24.0-0-${OS_CODENAME:-bookworm}
FROM ghcr.io/gythialy/golang-cross-builder:v1.24.1-0-${OS_CODENAME:-bookworm}

LABEL maintainer="Goren G<gythialy.koo+github@gmail.com>"
LABEL org.opencontainers.image.source https://github.com/gythialy/golang-cross

Check warning on line 6 in Dockerfile

View workflow job for this annotation

GitHub Actions / build

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "LABEL key=value" should be used instead of legacy "LABEL key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

COPY entrypoint.sh /

Expand All @@ -29,8 +29,8 @@
tar -xzf $SYFT_DOWNLOAD_FILE -C /usr/bin/ syft && \
rm $SYFT_DOWNLOAD_FILE

ARG GO_VERSION=go1.24.0
ARG GOLANG_DIST_SHA=dea9ca38a0b852a74e81c26134671af7c0fbe65d81b0dc1c5bfe22cf7d4c8858
ARG GO_VERSION=go1.24.1
ARG GOLANG_DIST_SHA=cb2396bae64183cdccf81a9a6df0aea3bce9511fc21469fb89a0c00470088073
# update golang
RUN \
GOLANG_DIST=https://storage.googleapis.com/golang/${GO_VERSION}.linux-amd64.tar.gz && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.builder
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# golang parameters
ARG GO_VERSION=1.24.0
ARG GO_VERSION=1.24.1
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.24.0}-${OS_CODENAME:-bookworm} AS base
FROM golang:${GO_VERSION:-1.24.1}-${OS_CODENAME:-bookworm} AS base

# osxcross parameters
ARG OSX_VERSION_MIN=10.13
Expand Down