From 8ef16d8b88ba6066d2820ff1a91429057fbc44ee Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 15 Aug 2023 17:07:14 +0200 Subject: [PATCH 1/2] Use go docker image with alpine 3.18 The 3.18 includes a fix for a bug in musl libc when there is a `search .` in /etc/resolv.conf. Fixes: https://github.com/k0sproject/k0s/issues/3351 Ref: https://www.openwall.com/lists/musl/2022/08/31/5 Signed-off-by: Natanael Copa (cherry picked from commit 1217281f787afed3e71abd1f6d554d043c27c453) --- embedded-bins/Makefile.variables | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index 0dde5e156133..9d164e484b40 100644 --- a/embedded-bins/Makefile.variables +++ b/embedded-bins/Makefile.variables @@ -1,6 +1,6 @@ alpine_version = 3.17 alpine_patch_version = $(alpine_version).4 -golang_buildimage=docker.io/library/golang:$(go_version)-alpine$(alpine_version) +golang_buildimage=docker.io/library/golang:$(go_version)-alpine3.18 go_version = 1.20.12 runc_version = 1.1.11 From 67bf595f767bc90fb403890b88d09fd9027710df Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Wed, 10 Jan 2024 09:31:55 +0100 Subject: [PATCH 2/2] Bump Go to v1.20.13 https://groups.google.com/g/golang-announce/c/F12eMaUITDs/m/Uw8CjnjKBAAJ https://go.dev/doc/devel/release#go1.20.13 https://github.com/golang/go/issues?q=milestone%3AGo1.20.13+label%3ACherryPickApproved Signed-off-by: Tom Wieczorek (cherry picked from commit ea2080d17c70527f4b0ae25c421107b86bc3c13b) (cherry picked from commit fb4909520e40876a6dab852616cb06b2ff8400ee) --- embedded-bins/Makefile.variables | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index 9d164e484b40..5318836430bb 100644 --- a/embedded-bins/Makefile.variables +++ b/embedded-bins/Makefile.variables @@ -1,7 +1,7 @@ alpine_version = 3.17 alpine_patch_version = $(alpine_version).4 golang_buildimage=docker.io/library/golang:$(go_version)-alpine3.18 -go_version = 1.20.12 +go_version = 1.20.13 runc_version = 1.1.11 runc_buildimage = $(golang_buildimage)