From e9261a5f6934ee674dcfdc991fc1fe3482b41f69 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Sun, 9 Nov 2025 11:08:43 +1100 Subject: [PATCH] make: use GO_VERSION=1 for release builds We have forgotten to bump GO_VERSION in our Dockerfile several times when doing releases from old release branches, leading to use using EOL'd Go versions for releases. We should just always use the latest version when building our release artefacts. Signed-off-by: Aleksa Sarai (cherry picked from commit 83eca0f0cf25bdd2bc1baca7cf9eba2514626a34) Signed-off-by: Aleksa Sarai --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 9ff8bad3f70..fa7a5d0d601 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ SHELL = /bin/bash CONTAINER_ENGINE := docker +CONTAINER_ENGINE_BUILD_FLAGS ?= +CONTAINER_ENGINE_RUN_FLAGS ?= + GO ?= go PREFIX ?= /usr/local @@ -111,7 +114,10 @@ static-bin: releaseall: RELEASE_ARGS := "-a 386 -a amd64 -a arm64 -a armel -a armhf -a ppc64le -a riscv64 -a s390x" releaseall: release +GO_VERSION ?= 1 + .PHONY: release +release: CONTAINER_ENGINE_BUILD_FLAGS := --build-arg GO_VERSION=$(GO_VERSION) release: runcimage $(CONTAINER_ENGINE) run $(CONTAINER_ENGINE_RUN_FLAGS) \ --rm -v $(CURDIR):/go/src/$(PROJECT) \