From 2f2f6463c0d9a24858c3b12fd8924813ce7a8cfc Mon Sep 17 00:00:00 2001 From: kari-ts Date: Thu, 13 Mar 2025 12:23:59 -0700 Subject: [PATCH] android: intall zip Add zip installation to Dockerfile and bump Docker image version Updates tailscale/tailscale#15210 Signed-off-by: kari-ts --- Makefile | 2 +- docker/DockerFile.amd64-build | 2 +- docker/DockerFile.amd64-shell | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e2b51d9..c004e43 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-191124 +DOCKER_IMAGE := tailscale-android-build-amd64-031325 export TS_USE_TOOLCHAIN=1 # Auto-select an NDK from ANDROID_HOME (choose highest version available) diff --git a/docker/DockerFile.amd64-build b/docker/DockerFile.amd64-build index c4fa38a..90e3674 100644 --- a/docker/DockerFile.amd64-build +++ b/docker/DockerFile.amd64-build @@ -5,7 +5,7 @@ FROM --platform=linux/amd64 eclipse-temurin:20-jdk # To enable running android tools such as aapt RUN apt-get update && apt-get -y upgrade -RUN apt-get install -y libz1 libstdc++6 unzip +RUN apt-get install -y libz1 libstdc++6 unzip zip # For Go: RUN apt-get -y --no-install-recommends install curl gcc RUN apt-get -y --no-install-recommends install ca-certificates libc6-dev git diff --git a/docker/DockerFile.amd64-shell b/docker/DockerFile.amd64-shell index 5f73272..79babfd 100644 --- a/docker/DockerFile.amd64-shell +++ b/docker/DockerFile.amd64-shell @@ -5,7 +5,7 @@ FROM --platform=linux/amd64 eclipse-temurin:20-jdk # To enable running android tools such as aapt RUN apt-get update && apt-get -y upgrade -RUN apt-get install -y libz1 libstdc++6 unzip +RUN apt-get install -y libz1 libstdc++6 unzip zip # For Go: RUN apt-get -y --no-install-recommends install curl gcc RUN apt-get -y --no-install-recommends install ca-certificates libc6-dev git