diff --git a/.go-version b/.go-version index a6c2798a..2f4320f6 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23.0 +1.24.4 diff --git a/go/Makefile.common b/go/Makefile.common index fea3cb76..d41bba7f 100644 --- a/go/Makefile.common +++ b/go/Makefile.common @@ -2,7 +2,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) include $(SELF_DIR)/../Makefile.common NAME := golang-crossbuild -VERSION := 1.23.0 +VERSION := 1.24.4 DEBIAN_VERSION ?= 9 SUFFIX := -$(shell basename $(CURDIR)) TAG_EXTENSION ?= diff --git a/go/base-arm/Dockerfile.tmpl b/go/base-arm/Dockerfile.tmpl index 3da81f6e..cf31f698 100644 --- a/go/base-arm/Dockerfile.tmpl +++ b/go/base-arm/Dockerfile.tmpl @@ -65,14 +65,14 @@ RUN \ ARG VERSION {{- if eq .FIPS "true"}} -ARG SECURITY_VERSION=-2 +ARG SECURITY_VERSION=-1 ARG GOLANG_DOWNLOAD_URL=https://aka.ms/golang/release/latest/go$VERSION$SECURITY_VERSION.linux-arm64.tar.gz # Use a different arg name for microsoft/go sha so it can be handled seperately from the regular golang sha -ARG MSFT_DOWNLOAD_SHA256=44ba769dd398f8fc5f381812c2eb323b4bc6cb11010d59efdba3244184e29b3fd +ARG MSFT_DOWNLOAD_SHA256=44b769dd398f8fc5f381812c2eb323b4bc6cb11010d59efdba3244184e29b3fd ARG DOWNLOAD_SHA256=$MSFT_DOWNLOAD_SHA256 {{- else}} ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$VERSION.linux-arm64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=d550a1ee5aca0f258d5fe9bfaed401958445014495dc115f202d43d5210b45241 +ARG GOLANG_DOWNLOAD_SHA256=d5501ee5aca0f258d5fe9bfaed401958445014495dc115f202d43d5210b45241 ARG DOWNLOAD_SHA256=$GOLANG_DOWNLOAD_SHA256 {{- end}} diff --git a/go/base/Dockerfile.tmpl b/go/base/Dockerfile.tmpl index 5597313f..597a95f1 100644 --- a/go/base/Dockerfile.tmpl +++ b/go/base/Dockerfile.tmpl @@ -33,14 +33,14 @@ RUN ln -s /usr/bin/pip3 /usr/bin/pip ARG VERSION {{- if eq .FIPS "true"}} -ARG SECURITY_VERSION=-2 +ARG SECURITY_VERSION=-1 ARG GOLANG_DOWNLOAD_URL=https://aka.ms/golang/release/latest/go$VERSION$SECURITY_VERSION.linux-amd64.tar.gz # Use a different arg name for microsoft/go sha so it can be handled seperately from the regular golang sha -ARG MSFT_DOWNLOAD_SHA256=f21ddf7ca3b029cf67615f6b2ca68e5aa83a50b2e2ea5952a5ea7bf9fa17e3358 +ARG MSFT_DOWNLOAD_SHA256=f21ddf7c3b029cf67615f6b2ca68e5aa83a50b2e2ea5952a5ea7bf9fa17e3358 ARG DOWNLOAD_SHA256=$MSFT_DOWNLOAD_SHA256 {{- else}} ARG GOLANG_DOWNLOAD_URL=https://golang.org/dl/go$VERSION.linux-amd64.tar.gz -ARG GOLANG_DOWNLOAD_SHA256=77e5daa33bb72aeaef1ba4418b6fe511bc4d041873cbf82e5aa6318740df98717 +ARG GOLANG_DOWNLOAD_SHA256=77e5da33bb72aeaef1ba4418b6fe511bc4d041873cbf82e5aa6318740df98717 ARG DOWNLOAD_SHA256=$GOLANG_DOWNLOAD_SHA256 {{- end }}