Skip to content

Commit

Permalink
Merge pull request #182 from cpanato/go-1195
Browse files Browse the repository at this point in the history
bump go to 1.19.5 and goreleaser to 1.14.1
  • Loading branch information
gythialy authored Jan 11, 2023
2 parents fc77734 + ad23a6b commit eba0c47
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
packages: write
contents: read
env:
GOLANG_CROSS_TAG: "v1.19.4-0"
GOLANG_CROSS_TAG: "v1.19.5-0"
DOCKER_REGISTRY: "ghcr.io"

steps:
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ COPY --from=gcr.io/projectsigstore/cosign:v1.13.1@sha256:fd5b09be23ef1027e1bdd49
# install syft
COPY --from=docker.io/anchore/syft:v0.60.1@sha256:aecec041ecc7cb8ffc83b2cadc8a2930cb2a6c8afef69ed4093a3345ea88c63c /syft /usr/local/bin/syft

ARG GO_VERSION=1.19.4
ARG GOLANG_DIST_SHA=c9c08f783325c4cf840a94333159cc937f05f75d36a8b307951d5bd959cf2ab8
ARG GO_VERSION=1.19.5
ARG GOLANG_DIST_SHA=36519702ae2fd573c9869461990ae550c8c0d955cd28d2827a6b159fda81ff95
# update golang
RUN \
GOLANG_DIST=https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz && \
Expand All @@ -23,8 +23,8 @@ RUN \
go version

# install goreleaser
ARG GORELEASER_VERSION=1.13.1
ARG GORELEASER_SHA=136fecfb2e2f3a7965274ad5e2571985d8b2fa724b6536874f082e4b0bb9f344
ARG GORELEASER_VERSION=1.14.1
ARG GORELEASER_SHA=d6cc1340201de942cf1d1b213f7451e141daa6b29f5989de22560b05203e74cb
RUN \
wget https://github.com/goreleaser/goreleaser/releases/download/v$GORELEASER_VERSION/checksums.txt.pem && \
GORELEASER_DOWNLOAD_FILE=goreleaser_Linux_x86_64.tar.gz && \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.builder
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# golang parameters
ARG GO_VERSION=1.19.4
ARG GO_VERSION=1.19.5

# osxcross parameters
ARG OSX_VERSION_MIN=10.12
ARG OSX_CROSS_COMMIT=50e86ebca7d14372febd0af8cd098705049161b9

FROM golang:${GO_VERSION:-1.19.4}-bullseye AS base
FROM golang:${GO_VERSION:-1.19.5}-bullseye 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 Expand Up @@ -72,7 +72,7 @@ RUN set -x; echo "Starting image build for Debian " \
WORKDIR "${OSX_CROSS_PATH}"
# install osxcross:
RUN git clone https://github.com/tpoechtrager/osxcross.git . \
&& git checkout -q "${OSX_CROSS_COMMIT:-50e86ebca7d14372febd0af8cd098705049161b9}"
&& git checkout -q "${OSX_CROSS_COMMIT:-50e86ebca7d14372febd0af8cd098705049161b9}"

# install osx sdk
COPY --from=ghcr.io/gythialy/golang-cross/osx-sdk:macos-12.3@sha256:6fc96c49165b28ed79e4228bcf59a001232a8a8e6c1d942a592dfe6e33352640 "${OSX_CROSS_PATH}/." "${OSX_CROSS_PATH}/"
Expand Down

0 comments on commit eba0c47

Please sign in to comment.