Skip to content

Makefile: add docker-tailscale-debug target with persistent debug keystore #781

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

Merged
bradfitz merged 1 commit into from
Apr 20, 2026
+27 −4
Merged

Makefile: add docker-tailscale-debug target with persistent debug keystore #781

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ tailscale.jks
# android sdk dir
./android-sdk

# Persistent $HOME/.android for `make docker-*` (keeps debug.keystore so
# the debug signer is stable across container runs).
.android-docker

# Java profiling output
*.hprof

Expand Down
27 changes: 23 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,28 @@ docker-build-image: ## Builds the docker image for the android build environment
docker build -f docker/DockerFile.amd64-build -t $(DOCKER_IMAGE) .; \
fi

# DOCKER_ANDROID_DIR is bind-mounted as /root/.android inside the container
# so the Gradle-generated debug keystore (and anything else under ~/.android)
# persists across docker runs. Without this, every docker-based debug build
# gets a fresh debug.keystore and a different signing cert, so `adb install -r`
# can't update a prior install. Mount target is /root/.android because the
# JVM's user.home resolves to /root for the container's root user, regardless
# of the Dockerfile's HOME=/build env.
DOCKER_ANDROID_DIR := $(CURDIR)/.android-docker

.PHONY: docker-android-dir
docker-android-dir:
@mkdir -p $(DOCKER_ANDROID_DIR)

DOCKER_RUN_VOLS := -v $(CURDIR):/build/tailscale-android -v $(DOCKER_ANDROID_DIR):/root/.android

.PHONY: docker-run-build
docker-run-build: clean jarsign-env docker-build-image ## Runs the docker image for the android build environment and builds release
@docker run --rm -v $(CURDIR):/build/tailscale-android --env JKS_PASSWORD=$(JKS_PASSWORD) --env JKS_PATH=$(JKS_PATH) $(DOCKER_IMAGE)
docker-run-build: clean jarsign-env docker-build-image docker-android-dir ## Runs the docker image for the android build environment and builds release
@docker run --rm $(DOCKER_RUN_VOLS) --env JKS_PASSWORD=$(JKS_PASSWORD) --env JKS_PATH=$(JKS_PATH) $(DOCKER_IMAGE)

.PHONY: docker-tailscale-debug
docker-tailscale-debug: docker-build-image docker-android-dir ## Build tailscale-debug.apk inside the docker env (stable signer across runs)
@docker run --rm $(DOCKER_RUN_VOLS) $(DOCKER_IMAGE) make tailscale-debug

.PHONY: docker-remove-build-image
docker-remove-build-image: ## Removes the current docker build image
Expand All @@ -377,8 +396,8 @@ docker-remove-build-image: ## Removes the current docker build image
docker-all: docker-build-image docker-run-build $(DOCKER_IMAGE)

.PHONY: docker-shell
docker-shell: docker-build-image ## Builds a docker image with the android build env and opens a shell
docker run --rm -v $(CURDIR):/build/tailscale-android -it $(DOCKER_IMAGE) /bin/bash
docker-shell: docker-build-image docker-android-dir ## Builds a docker image with the android build env and opens a shell
docker run --rm $(DOCKER_RUN_VOLS) -it $(DOCKER_IMAGE) /bin/bash

.PHONY: docker-remove-shell-image
docker-remove-shell-image: ## Removes all docker shell image
Expand Down
Loading