archive
/
tailscale-android
mirror of https://github.com/tailscale/tailscale-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

android: update base builder image (#625)

Browse Source 
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 <jonathan@tailscale.com>
pull/626/head
Jonathan Nobels 9 months ago committed by GitHub
parent 45d97105fb
commit 9a69bc3483
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

4
Makefile
Unescape Escape View File

@ -10,7 +10,7 @@
# with this name, it will be used. # with this name, it will be used.
# #
# The convention here is tailscale-android-build-amd64-<date> # The convention here is tailscale-android-build-amd64-<date>
DOCKER_IMAGE := tailscale-android-build-amd64-031325 DOCKER_IMAGE := tailscale-android-build-amd64-031325-1
export TS_USE_TOOLCHAIN=1 export TS_USE_TOOLCHAIN=1
# Auto-select an NDK from ANDROID_HOME (choose highest version available) # 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_URL := "https://dl.google.com/android/repository/commandlinetools-mac-9477386_latest.zip"
ANDROID_TOOLS_SUM := "2072ffce4f54cdc0e6d2074d2f381e7e579b7d63e915c220b96a7db95b2900ee commandlinetools-mac-9477386_latest.zip" ANDROID_TOOLS_SUM := "2072ffce4f54cdc0e6d2074d2f381e7e579b7d63e915c220b96a7db95b2900ee commandlinetools-mac-9477386_latest.zip"
endif 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 # Attempt to find an ANDROID_SDK_ROOT / ANDROID_HOME based either from
# preexisting environment or common locations. # preexisting environment or common locations.

2
docker/DockerFile.amd64-build
Unescape Escape View File

@ -1,7 +1,7 @@
# This is a Dockerfile for creating a build environment for # This is a Dockerfile for creating a build environment for
# tailscale-android. # 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 # To enable running android tools such as aapt
RUN apt-get update && apt-get -y upgrade RUN apt-get update && apt-get -y upgrade

2
docker/DockerFile.amd64-shell
Unescape Escape View File

@ -1,7 +1,7 @@
# This is a Dockerfile for creating a build environment for # This is a Dockerfile for creating a build environment for
# tailscale-android. # 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 # To enable running android tools such as aapt
RUN apt-get update && apt-get -y upgrade RUN apt-get update && apt-get -y upgrade

Write Preview
Loading…
Cancel
Save