Skip to content

Makefile: update Docker image when toolchain changes #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Makefile: update Docker image when toolchain changes #617

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-<date>
DOCKER_IMAGE=tailscale-android-build-amd64-191124
# The convention here is tailscale-android-build-amd64-<go.toolchain.rev>
#
# 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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually won't work the way it is because we have no way of refreshing the builder when the android toolchain updates (which won't get refreshed automatically). Can we append the android toolchain here as well? That should be sufficient. Maybe toss in a constant as well, just in case we ever have to manually trigger a refresh for other reasons.

export TS_USE_TOOLCHAIN=1

DEBUG_APK=tailscale-debug.apk
Expand Down