Skip to content

Commit

Permalink
Merge pull request #243 from cpanato/update-go121
Browse files Browse the repository at this point in the history
bump fo use go1.21.4 / cosign and syft
  • Loading branch information
gythialy authored Nov 15, 2023
2 parents 8c38dc2 + 3c1ec29 commit 18ee2db
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 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.21.3-0
default: v1.21.4-0
golang-version:
description: golang version
default: "1.21.3"
default: "1.21.4"
osxcross-git-hash:
description: git commit hash of osx-cross project
default: "3dcc13644cfaa3d7ea6a959acbe0f1a23cf2df72"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ LABEL org.opencontainers.image.source https://github.com/gythialy/golang-cross
COPY entrypoint.sh /

# install cosign
COPY --from=ghcr.io/sigstore/cosign/cosign:v2.2.0@sha256:280b47054876d415f66a279e666e35157cae6881f3538599710290c70bb75369 /ko-app/cosign /usr/local/bin/cosign
COPY --from=ghcr.io/sigstore/cosign/cosign:v2.2.1@sha256:88498ed17e61605cd68a5fc9d1fcd756ae0ef2d5515417881d739654accf818f /ko-app/cosign /usr/local/bin/cosign
# install syft
COPY --from=docker.io/anchore/syft:v0.92.0@sha256:981086797ad3cb1be49d763ffaa50f2bd558c354358112f46283dd3bf8cb0c75 /syft /usr/local/bin/syft
COPY --from=docker.io/anchore/syft:v0.96.0@sha256:64dcff82a5bc1a0363d16c5cc45f01dcfa63e7ac25b9ebac2caef32e18827a06 /syft /usr/local/bin/syft

ARG GO_VERSION=go1.21.4
ARG GOLANG_DIST_SHA=73cac0215254d0c7d1241fa40837851f3b9a8a742d0b54714cbdfb3feaf8f0af
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.builder
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# golang parameters
ARG GO_VERSION=1.21.3
ARG GO_VERSION=1.21.4

# osxcross parameters
ARG OSX_VERSION_MIN=10.12
ARG OSX_CROSS_COMMIT=3dcc13644cfaa3d7ea6a959acbe0f1a23cf2df72

FROM ghcr.io/gythialy/osx-sdk:v13 AS osx-sdk

FROM golang:${GO_VERSION:-1.21.3}-bookworm AS base
FROM golang:${GO_VERSION:-1.21.4}-bookworm AS base

# ARG APT_MIRROR
# RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
Expand Down

0 comments on commit 18ee2db

Please sign in to comment.