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

android: intall zip (#624)

Browse Source 
Add zip installation to Dockerfile and bump Docker image version

Updates tailscale/tailscale#15210
Signed-off-by: kari-ts <kari@tailscale.com>
pull/625/head
kari-ts 9 months ago committed by GitHub
parent 599fa15104
commit 45d97105fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
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-191124 DOCKER_IMAGE := tailscale-android-build-amd64-031325
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)

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

@ -5,7 +5,7 @@ FROM --platform=linux/amd64 eclipse-temurin:20-jdk
# 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
RUN apt-get install -y libz1 libstdc++6 unzip RUN apt-get install -y libz1 libstdc++6 unzip zip
# For Go: # For Go:
RUN apt-get -y --no-install-recommends install curl gcc RUN apt-get -y --no-install-recommends install curl gcc
RUN apt-get -y --no-install-recommends install ca-certificates libc6-dev git RUN apt-get -y --no-install-recommends install ca-certificates libc6-dev git

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

@ -5,7 +5,7 @@ FROM --platform=linux/amd64 eclipse-temurin:20-jdk
# 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
RUN apt-get install -y libz1 libstdc++6 unzip RUN apt-get install -y libz1 libstdc++6 unzip zip
# For Go: # For Go:
RUN apt-get -y --no-install-recommends install curl gcc RUN apt-get -y --no-install-recommends install curl gcc
RUN apt-get -y --no-install-recommends install ca-certificates libc6-dev git RUN apt-get -y --no-install-recommends install ca-certificates libc6-dev git

Write Preview
Loading…
Cancel
Save