From b6f4e301b7064b861a792d6466c0295a6d751cba Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Sat, 16 Dec 2023 16:02:44 +0100 Subject: [PATCH 1/2] dockerfile: align go version in vendor dockerfile Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- hack/dockerfiles/vendor.Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index a72228b6..d086236d 100644 --- a/hack/dockerfiles/vendor.Dockerfile +++ b/hack/dockerfiles/vendor.Dockerfile @@ -16,9 +16,10 @@ # upstream at https://github.com/moby/buildkit/blob/master/hack/dockerfiles/vendor.Dockerfile -ARG GO_VERSION=1.20 +ARG GO_VERSION="1.21" +ARG ALPINE_VERSION="3.17" -FROM golang:${GO_VERSION}-alpine AS base +FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base RUN apk add --no-cache git rsync WORKDIR /src From 117441409878dcb4153754e6dc2796de5bfaa369 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Sat, 16 Dec 2023 15:35:59 +0100 Subject: [PATCH 2/2] gomod: update min go version Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 558ac32e..3a88967e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/docker/buildkit-syft-scanner -go 1.21.3 +go 1.21.0 require ( github.com/anchore/go-logger v0.0.0-20230725134548-c21dafa1ec5a