From c03d56cfdc4f09cc788c06580d9caa7489ec1790 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 17 Jul 2023 00:40:29 +0200 Subject: [PATCH 1/2] deb: update to golang bullseye Signed-off-by: Sebastiaan van Stijn --- deb/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deb/Dockerfile b/deb/Dockerfile index 7713e232..6d479319 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -4,7 +4,7 @@ ARG GO_VERSION=1.20.5 ARG DISTRO=ubuntu ARG SUITE=focal -FROM golang:${GO_VERSION}-buster AS golang +FROM golang:${GO_VERSION}-bullseye AS golang FROM ${DISTRO}:${SUITE} From a3d1ffcdb24cbbe8ffa3c94ee856520e81530402 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 17 Jul 2023 00:37:04 +0200 Subject: [PATCH 2/2] update go to go1.20.6 go1.20.6 (released 2023-07-11) includes a security fix to the net/http package, as well as bug fixes to the compiler, cgo, the cover tool, the go command, the runtime, and the crypto/ecdsa, go/build, go/printer, net/mail, and text/template packages. See the Go 1.20.6 milestone on our issue tracker for details. https://github.com/golang/go/issues?q=milestone%3AGo1.20.6+label%3ACherryPickApproved Full diff: https://github.com/golang/go/compare/go1.20.5...go1.20.6 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 --- .github/workflows/build.yml | 2 +- Dockerfile | 2 +- deb/Dockerfile | 2 +- docker-bake.hcl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4e54373..5051de12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ on: env: DESTDIR: ./bin - GO_VERSION: 1.20.5 + GO_VERSION: 1.20.6 jobs: validate: diff --git a/Dockerfile b/Dockerfile index a10dc628..e026b062 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 OSXCROSS_VERSION=11.3-r7-debian ARG GOLANGCI_LINT_VERSION=v1.51.1 diff --git a/deb/Dockerfile b/deb/Dockerfile index 6d479319..192cc061 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.20.5 +ARG GO_VERSION=1.20.6 ARG DISTRO=ubuntu ARG SUITE=focal diff --git a/docker-bake.hcl b/docker-bake.hcl index 8acf1979..78fc5e87 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ variable "GO_VERSION" { - default = "1.20.5" + default = "1.20.6" } # Defines the output folder