From 9a69bc3483c28fc602ebdf0bc387137424b6ff18 Mon Sep 17 00:00:00 2001 From: Jonathan Nobels Date: Thu, 13 Mar 2025 18:07:45 -0400 Subject: [PATCH] android: update base builder image (#625) Updating our base builder to eclipse-temurin:21 to fix apt dependency errors. Updating the default toolchains to speed up the build. Updates tailscale/tailscale#15210 Signed-off-by: Jonathan Nobels --- Makefile | 4 ++-- docker/DockerFile.amd64-build | 2 +- docker/DockerFile.amd64-shell | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c004e43..2db7821 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ # with this name, it will be used. # # The convention here is tailscale-android-build-amd64- -DOCKER_IMAGE := tailscale-android-build-amd64-031325 +DOCKER_IMAGE := tailscale-android-build-amd64-031325-1 export TS_USE_TOOLCHAIN=1 # Auto-select an NDK from ANDROID_HOME (choose highest version available) @@ -46,7 +46,7 @@ else ANDROID_TOOLS_URL := "https://dl.google.com/android/repository/commandlinetools-mac-9477386_latest.zip" ANDROID_TOOLS_SUM := "2072ffce4f54cdc0e6d2074d2f381e7e579b7d63e915c220b96a7db95b2900ee commandlinetools-mac-9477386_latest.zip" endif -ANDROID_SDK_PACKAGES := 'platforms;android-31' 'extras;android;m2repository' 'ndk;23.1.7779620' 'platform-tools' 'build-tools;33.0.2' +ANDROID_SDK_PACKAGES := 'platforms;android-34' 'extras;android;m2repository' 'ndk;23.1.7779620' 'platform-tools' 'build-tools;34.0.0' # Attempt to find an ANDROID_SDK_ROOT / ANDROID_HOME based either from # preexisting environment or common locations. diff --git a/docker/DockerFile.amd64-build b/docker/DockerFile.amd64-build index 90e3674..b911779 100644 --- a/docker/DockerFile.amd64-build +++ b/docker/DockerFile.amd64-build @@ -1,7 +1,7 @@ # This is a Dockerfile for creating a build environment for # tailscale-android. -FROM --platform=linux/amd64 eclipse-temurin:20-jdk +FROM --platform=linux/amd64 eclipse-temurin:21 # To enable running android tools such as aapt RUN apt-get update && apt-get -y upgrade diff --git a/docker/DockerFile.amd64-shell b/docker/DockerFile.amd64-shell index 79babfd..cdacec7 100644 --- a/docker/DockerFile.amd64-shell +++ b/docker/DockerFile.amd64-shell @@ -1,7 +1,7 @@ # This is a Dockerfile for creating a build environment for # tailscale-android. -FROM --platform=linux/amd64 eclipse-temurin:20-jdk +FROM --platform=linux/amd64 eclipse-temurin:21 # To enable running android tools such as aapt RUN apt-get update && apt-get -y upgrade