Skip to content

Commit f9686bd

Browse files
committed
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 <[email protected]>
1 parent 6a3342e commit f9686bd

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
99
# will force a rebuild of the docker image. If there is an existing image
1010
# with this name, it will be used.
1111
#
12-
# The convention here is tailscale-android-build-amd64-<date>
13-
DOCKER_IMAGE=tailscale-android-build-amd64-191124
12+
# The convention here is tailscale-android-build-amd64-<go.toolchain.rev>
13+
#
14+
# Read the current Go toolchain revision.
15+
GO_TOOLCHAIN_REV := $(shell cat go.toolchain.rev)
16+
17+
# Define the Docker image tag using the current revision.
18+
DOCKER_IMAGE := tailscale-android-build-amd64-$(GO_TOOLCHAIN_REV)
1419
export TS_USE_TOOLCHAIN=1
1520

1621
DEBUG_APK=tailscale-debug.apk

0 commit comments

Comments
 (0)