From 15a103dff6d2639c9df4b19f8880fded3ad3d115 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 9 Dec 2021 17:16:50 +0100 Subject: [PATCH 1/2] Update to debian bullseye Signed-off-by: Sebastiaan van Stijn (cherry picked from commit dce5929794039736f6403805a636f5467d6a9958) Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 4 ++-- docker-bake.hcl | 2 +- dockerfiles/Dockerfile.e2e | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed6473d63388..32dcad4edd3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,12 +17,12 @@ ARG TARGETPLATFORM # gcc is installed for libgcc only RUN xx-apk add --no-cache musl-dev gcc -FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-buster AS build-base-buster +FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-bullseye COPY --from=xx / / RUN apt-get update && apt-get install --no-install-recommends -y clang lld file WORKDIR /go/src/github.com/docker/cli -FROM build-base-buster AS build-buster +FROM build-base-bullseye AS build-bullseye ARG TARGETPLATFORM RUN xx-apt install --no-install-recommends -y libc6-dev libgcc-8-dev diff --git a/docker-bake.hcl b/docker-bake.hcl index ab3efdf3ce87..f370b8499609 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -22,7 +22,7 @@ target "binary" { platforms = ["local"] output = ["build"] args = { - BASE_VARIANT = USE_GLIBC != "" ? "buster" : "alpine" + BASE_VARIANT = USE_GLIBC != "" ? "bullseye" : "alpine" VERSION = VERSION GO_STRIP = STRIP_TARGET } diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index 56a39b50cfa3..f80445b367e2 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,7 +1,7 @@ ARG GO_VERSION=1.19.10 # Use Debian based image as docker-compose requires glibc. -FROM golang:${GO_VERSION}-buster +FROM golang:${GO_VERSION}-bullseye RUN apt-get update && apt-get install -y \ build-essential \ From 9b217938901012f93a6dd89b30922fdd2f766474 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 17 Jul 2023 16:29:40 +0200 Subject: [PATCH 2/2] [20.10] update go to go1.19.11 go1.19.11 (released 2023-07-11) includes a security fix to the net/http package, as well as bug fixes to cgo, the cover tool, the go command, the runtime, and the go/printer package. See the Go 1.19.11 milestone on our issue tracker for details: https://github.com/golang/go/issues?q=milestone%3AGo1.19.11+label%3ACherryPickApproved Full diff: https://github.com/golang/go/compare/go1.19.10...go1.19.11 These minor releases include 1 security fixes following the security policy: net/http: insufficient sanitization of Host header The HTTP/1 client did not fully validate the contents of the Host header. A maliciously crafted Host header could inject additional headers or entire requests. The HTTP/1 client now refuses to send requests containing an invalid Request.Host or Request.URL.Host value. Thanks to Bartek Nowotarski for reporting this issue. Includes security fixes for [CVE-2023-29406 ][1] and Go issue https://go.dev/issue/60374 [1]: https://github.com/advisories/GHSA-f8f7-69v5-w4vx Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- appveyor.yml | 2 +- docker-bake.hcl | 2 +- dockerfiles/Dockerfile.binary-native | 2 +- dockerfiles/Dockerfile.dev | 2 +- dockerfiles/Dockerfile.e2e | 2 +- dockerfiles/Dockerfile.lint | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32dcad4edd3a..80d2dbe3fc41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG BASE_VARIANT=alpine -ARG GO_VERSION=1.19.10 +ARG GO_VERSION=1.19.11 ARG ALPINE_VERSION=3.17 ARG XX_VERSION=1.1.0 diff --git a/appveyor.yml b/appveyor.yml index 0d08c2bfed12..b31e678936f2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli environment: GOPATH: c:\gopath - GOVERSION: 1.19.10 + GOVERSION: 1.19.11 DEPVERSION: v0.4.1 install: diff --git a/docker-bake.hcl b/docker-bake.hcl index f370b8499609..110a59555673 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ variable "GO_VERSION" { - default = "1.19.10" + default = "1.19.11" } variable "VERSION" { default = "" diff --git a/dockerfiles/Dockerfile.binary-native b/dockerfiles/Dockerfile.binary-native index 1de42ad2ea9a..a34f0dce1b24 100644 --- a/dockerfiles/Dockerfile.binary-native +++ b/dockerfiles/Dockerfile.binary-native @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.19.10 +ARG GO_VERSION=1.19.11 FROM golang:${GO_VERSION}-alpine diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 062cc2ddef68..6faf5cf63e1b 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.19.10 +ARG GO_VERSION=1.19.11 ARG ALPINE_VERSION=3.17 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS golang diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index f80445b367e2..40407c27165c 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.19.10 +ARG GO_VERSION=1.19.11 # Use Debian based image as docker-compose requires glibc. FROM golang:${GO_VERSION}-bullseye diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 9436a1070896..cd3d793e6ed0 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.19.10 +ARG GO_VERSION=1.19.11 ARG ALPINE_VERSION=3.17 ARG GOLANGCI_LINT_VERSION=v1.49.0