From 7f2293308b5e6b0144fc635f971044f29593dd76 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 17 Jul 2023 10:23:02 +0200 Subject: [PATCH 1/2] update go to 1.20.6 Signed-off-by: CrazyMax --- Dockerfile | 2 +- docker-bake.hcl | 2 +- hack/dockerfiles/docs.Dockerfile | 2 +- hack/dockerfiles/generated-files.Dockerfile | 2 +- hack/dockerfiles/lint.Dockerfile | 2 +- hack/dockerfiles/vendor.Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2563a14cd85..d4aacbc3cf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.5 +ARG GO_VERSION=1.20.6 ARG XX_VERSION=1.2.1 ARG DOCKER_VERSION=24.0.2 diff --git a/docker-bake.hcl b/docker-bake.hcl index 9bfaa7c6936..8b62bf6937a 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ variable "GO_VERSION" { - default = "1.20.5" + default = null } variable "DOCS_FORMATS" { default = "md" diff --git a/hack/dockerfiles/docs.Dockerfile b/hack/dockerfiles/docs.Dockerfile index 88d1f6c9f67..1cb1d9c9ded 100644 --- a/hack/dockerfiles/docs.Dockerfile +++ b/hack/dockerfiles/docs.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20 +ARG GO_VERSION=1.20.6 ARG FORMATS=md,yaml FROM golang:${GO_VERSION}-alpine AS docsgen diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile index 540f18fd677..1b991fcc35f 100644 --- a/hack/dockerfiles/generated-files.Dockerfile +++ b/hack/dockerfiles/generated-files.Dockerfile @@ -5,7 +5,7 @@ # Copyright The Buildx Authors. # Licensed under the Apache License, Version 2.0 -ARG GO_VERSION="1.20" +ARG GO_VERSION="1.20.6" ARG PROTOC_VERSION="3.11.4" # protoc is dynamically linked to glibc so can't use alpine base diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index 7cc065eac30..d6d1ef7bcea 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20 +ARG GO_VERSION=1.20.6 FROM golang:${GO_VERSION}-alpine RUN apk add --no-cache git gcc musl-dev diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index 8a8d72ed215..124d121e2bb 100644 --- a/hack/dockerfiles/vendor.Dockerfile +++ b/hack/dockerfiles/vendor.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20 +ARG GO_VERSION=1.20.6 ARG MODOUTDATED_VERSION=v0.8.0 FROM golang:${GO_VERSION}-alpine AS base From 1123bfed103887ace2b2020796083323e22cbb3f Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 17 Jul 2023 10:27:54 +0200 Subject: [PATCH 2/2] hack(generated-files): bump golang image to bookworm #7 [internal] load metadata for docker.io/library/golang:1.20.6-buster #7 ERROR: docker.io/library/golang:1.20.6-buster: not found Signed-off-by: CrazyMax --- hack/dockerfiles/generated-files.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile index 1b991fcc35f..c4f03a8f1d4 100644 --- a/hack/dockerfiles/generated-files.Dockerfile +++ b/hack/dockerfiles/generated-files.Dockerfile @@ -9,7 +9,7 @@ ARG GO_VERSION="1.20.6" ARG PROTOC_VERSION="3.11.4" # protoc is dynamically linked to glibc so can't use alpine base -FROM golang:${GO_VERSION}-buster AS base +FROM golang:${GO_VERSION}-bookworm AS base RUN apt-get update && apt-get --no-install-recommends install -y git unzip ARG PROTOC_VERSION ARG TARGETOS