Skip to content

Commit

Permalink
Merge pull request #339 from cpanato/update-go123
Browse files Browse the repository at this point in the history
update to go1.23.2
  • Loading branch information
gythialy authored Oct 2, 2024
2 parents bed2286 + d9e1db2 commit 79cac42
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
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.23.1-0
default: v1.23.2-0
golang-version:
description: golang version
default: "1.23.1"
default: "1.23.2"
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,6 +1,6 @@
ARG OS_CODENAME=bookworm

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

LABEL maintainer="Goren G<[email protected]>"
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/

Check warning on line 6 in Dockerfile

View workflow job for this annotation

GitHub Actions / release (bullseye)

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/

Check warning on line 6 in Dockerfile

View workflow job for this annotation

GitHub Actions / release (bookworm)

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/

Check warning on line 6 in Dockerfile

View workflow job for this annotation

GitHub Actions / release (bullseye)

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/

Check warning on line 6 in Dockerfile

View workflow job for this annotation

GitHub Actions / release (bookworm)

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/
Expand Down Expand Up @@ -29,8 +29,8 @@ RUN \
tar -xzf $SYFT_DOWNLOAD_FILE -C /usr/bin/ syft && \
rm $SYFT_DOWNLOAD_FILE

ARG GO_VERSION=go1.23.1
ARG GOLANG_DIST_SHA=49bbb517cfa9eee677e1e7897f7cf9cfdbcf49e05f61984a2789136de359f9bd
ARG GO_VERSION=go1.23.2
ARG GOLANG_DIST_SHA=542d3c1705f1c6a1c5a80d5dc62e2e45171af291e755d591c5e6531ef63b454e
# 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.23.1
ARG GO_VERSION=1.23.2
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.23.1}-${OS_CODENAME:-bookworm} AS base
FROM golang:${GO_VERSION:-1.23.2}-${OS_CODENAME:-bookworm} AS base

# osxcross parameters
ARG OSX_VERSION_MIN=10.13
Expand Down

0 comments on commit 79cac42

Please sign in to comment.