Merge pull request #199 from crazy-max/update-go

update go

Author: crazy-max

common/packages.hcl

@@ -225,6 +225,6 @@ target "_pkg-static" {
     PKG_DISTRO = "static"
     PKG_DISTRO_ID = ""
     PKG_DISTRO_SUITE = ""
-    PKG_BASE_IMAGE = "debian:bullseye"
+    PKG_BASE_IMAGE = "debian:bookworm"
   }
 }

common/packages.mk

@@ -199,5 +199,5 @@ pkg-info-static:
 	$(eval PKG_DISTRO = static)
 	$(eval PKG_DISTRO_ID =)
 	$(eval PKG_DISTRO_SUITE =)
-	$(eval PKG_BASE_IMAGE = debian:bullseye)
+	$(eval PKG_BASE_IMAGE = debian:bookworm)
 	$(eval PKG_SUPPORTED_PLATFORMS =)

common/vars.mk

@@ -16,8 +16,8 @@ export BASEDIR ?= $(CURDIR)
 
 # go base image
 export GO_IMAGE ?= golang
-export GO_VERSION ?= 1.21.3
-export GO_IMAGE_VARIANT ?= bullseye
+export GO_VERSION ?= 1.24.4
+export GO_IMAGE_VARIANT ?= bookworm
 
 # if set, ony build matching the local platform
 # e.g., LOCAL_PLATFORM=1 make deb

pkg/buildx/Dockerfile

@@ -14,19 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG XX_VERSION="1.2.1"
+ARG XX_VERSION="1.6.1"
 ARG DEBIAN_FRONTEND="noninteractive"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.21.3"
-ARG GO_IMAGE_VARIANT="bullseye"
-ARG PKG_RELEASE="debian11"
+ARG GO_VERSION="1.24.4"
+ARG GO_IMAGE_VARIANT="bookworm"
+ARG PKG_RELEASE="debian12"
 ARG PKG_TYPE="deb"
 ARG PKG_DISTRO="debian"
-ARG PKG_DISTRO_ID="11"
-ARG PKG_DISTRO_SUITE="bullseye"
-ARG PKG_BASE_IMAGE="debian:bullseye"
+ARG PKG_DISTRO_ID="12"
+ARG PKG_DISTRO_SUITE="bookworm"
+ARG PKG_BASE_IMAGE="debian:bookworm"
 
 # stage used as named context that mounts common/scripts
 # see pkg target in docker-bake.hcl
@@ -84,6 +84,7 @@ ARG DEBIAN_FRONTEND
 ENV GOPROXY="https://proxy.golang.org|direct"
 ENV GOPATH="/go"
 ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
+ENV GOTOOLCHAIN="local"
 ENV GO111MODULE="on"
 ENV CGO_ENABLED="0"
 ARG PKG_RELEASE
@@ -117,6 +118,7 @@ COPY --from=xx / /
 ENV GOPROXY="https://proxy.golang.org|direct"
 ENV GOPATH="/go"
 ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
+ENV GOTOOLCHAIN="local"
 ENV GO111MODULE="on"
 ENV CGO_ENABLED="0"
 ARG PKG_RELEASE
@@ -153,6 +155,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certifi
 ENV GOPROXY="https://proxy.golang.org|direct"
 ENV GOPATH="/go"
 ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
+ENV GOTOOLCHAIN="local"
 ENV GO111MODULE="on"
 ENV CGO_ENABLED="0"
 ARG PKG_NAME

pkg/buildx/Makefile

@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/docker/buildx/blob/master/Dockerfile#L3
-export GO_VERSION = 1.21.3
+export GO_VERSION = 1.24.4
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

pkg/buildx/docker-bake.hcl

@@ -34,10 +34,10 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.21.3"
+  default = "1.24.4"
 }
 variable "GO_IMAGE_VARIANT" {
-  default = "bullseye"
+  default = "bookworm"
 }
 
 # Sets the pkg name.

pkg/buildx/verify.Dockerfile

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG XX_VERSION="1.2.1"
+ARG XX_VERSION="1.6.1"
 
 ARG PKG_TYPE
 ARG PKG_BASE_IMAGE

pkg/compose/Dockerfile

@@ -14,19 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG XX_VERSION="1.2.1"
+ARG XX_VERSION="1.6.1"
 ARG DEBIAN_FRONTEND="noninteractive"
 
 # common args
 ARG GO_IMAGE="golang"
-ARG GO_VERSION="1.21.1"
-ARG GO_IMAGE_VARIANT="bullseye"
-ARG PKG_RELEASE="debian11"
+ARG GO_VERSION="1.23.8"
+ARG GO_IMAGE_VARIANT="bookworm"
+ARG PKG_RELEASE="debian12"
 ARG PKG_TYPE="deb"
 ARG PKG_DISTRO="debian"
-ARG PKG_DISTRO_SUITE="bullseye"
-ARG PKG_DISTRO_ID="11"
-ARG PKG_BASE_IMAGE="debian:bullseye"
+ARG PKG_DISTRO_SUITE="bookworm"
+ARG PKG_DISTRO_ID="12"
+ARG PKG_BASE_IMAGE="debian:bookworm"
 
 # stage used as named context that mounts common/scripts
 # see pkg target in docker-bake.hcl
@@ -87,6 +87,7 @@ ARG DEBIAN_FRONTEND
 ENV GOPROXY="https://proxy.golang.org|direct"
 ENV GOPATH="/go"
 ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
+ENV GOTOOLCHAIN="local"
 ENV GO111MODULE="on"
 ENV CGO_ENABLED="0"
 ARG PKG_RELEASE
@@ -120,6 +121,7 @@ COPY --from=xx / /
 ENV GOPROXY="https://proxy.golang.org|direct"
 ENV GOPATH="/go"
 ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
+ENV GOTOOLCHAIN="local"
 ENV GO111MODULE="on"
 ENV CGO_ENABLED="0"
 ARG PKG_RELEASE
@@ -157,6 +159,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certifi
 ENV GOPROXY="https://proxy.golang.org|direct"
 ENV GOPATH="/go"
 ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
+ENV GOTOOLCHAIN="local"
 ENV GO111MODULE="on"
 ENV CGO_ENABLED="0"
 ARG PKG_NAME
@@ -188,6 +191,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certifi
 ENV GOPROXY="https://proxy.golang.org|direct"
 ENV GOPATH="/go"
 ENV PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
+ENV GOTOOLCHAIN="local"
 ENV GO111MODULE="on"
 ENV CGO_ENABLED="0"
 ARG PKG_NAME

pkg/compose/Makefile

@@ -15,7 +15,7 @@
 include ../../common/vars.mk
 
 # https://github.com/docker/compose/blob/main/Dockerfile#L18
-export GO_VERSION = 1.21.1
+export GO_VERSION = 1.23.8
 
 DESTDIR ?= $(BASEDIR)/bin
 BAKE_DEFINITIONS ?= -f docker-bake.hcl -f ../../common/packages.hcl

pkg/compose/docker-bake.hcl

@@ -34,10 +34,10 @@ variable "GO_IMAGE" {
   default = "golang"
 }
 variable "GO_VERSION" {
-  default = "1.21.1"
+  default = "1.23.8"
 }
 variable "GO_IMAGE_VARIANT" {
-  default = "bullseye"
+  default = "bookworm"
 }
 
 # Sets the pkg name.