From f9686bd06c0c0ed8135902b0d66fa1aefa32c2ce Mon Sep 17 00:00:00 2001 From: kari-ts Date: Thu, 27 Feb 2025 11:29:44 -0800 Subject: [PATCH] Makefile: update Docker image when toolchain changes Update Docker image whenever we update the toolchange to force rebuild. Fixes tailscale/corp#26816 Signed-off-by: kari-ts --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d1a48afcf0..8535677abb 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,13 @@ # will force a rebuild of the docker image. If there is an existing image # with this name, it will be used. # -# The convention here is tailscale-android-build-amd64- -DOCKER_IMAGE=tailscale-android-build-amd64-191124 +# The convention here is tailscale-android-build-amd64- +# +# Read the current Go toolchain revision. +GO_TOOLCHAIN_REV := $(shell cat go.toolchain.rev) + +# Define the Docker image tag using the current revision. +DOCKER_IMAGE := tailscale-android-build-amd64-$(GO_TOOLCHAIN_REV) export TS_USE_TOOLCHAIN=1 DEBUG_APK=tailscale-debug.apk