From 50e414f82a5783b83d2da68aa8fc87e37922dd5a Mon Sep 17 00:00:00 2001 From: Justin Chadwell Date: Wed, 12 Jul 2023 14:31:23 +0100 Subject: [PATCH 1/3] hack: force go version to 1.20.5 A temporary workaround for "http: invalid Host header" introduced in go 1.20.6. Signed-off-by: Justin Chadwell (cherry picked from commit c4bec0546686a8978c692de97f31cf9e460e1af0) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- docker-bake.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 215891fc..2563a14c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20 +ARG GO_VERSION=1.20.5 ARG XX_VERSION=1.2.1 ARG DOCKER_VERSION=24.0.2 diff --git a/docker-bake.hcl b/docker-bake.hcl index f530535a..9bfaa7c6 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ variable "GO_VERSION" { - default = "1.20" + default = "1.20.5" } variable "DOCS_FORMATS" { default = "md" From 54de900931f97087af8d19f87e4d611f0d437646 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 17 Jul 2023 10:23:02 +0200 Subject: [PATCH 2/3] update go to 1.20.6 Signed-off-by: CrazyMax (cherry picked from commit 7f2293308b5e6b0144fc635f971044f29593dd76) Signed-off-by: Sebastiaan van Stijn --- 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 2563a14c..d4aacbc3 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 9bfaa7c6..8b62bf69 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 88d1f6c9..1cb1d9c9 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 540f18fd..1b991fcc 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 7cc065ea..d6d1ef7b 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 8a8d72ed..124d121e 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 7dddd3a7d3136cd985abe580dc7199df38f14354 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 17 Jul 2023 10:27:54 +0200 Subject: [PATCH 3/3] 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 (cherry picked from commit 1123bfed103887ace2b2020796083323e22cbb3f) Signed-off-by: Sebastiaan van Stijn --- 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 1b991fcc..c4f03a8f 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