diff options
| -rw-r--r-- | docker/android-ndk/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/android-sdk/Dockerfile | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index d7a59c9b..07ccc010 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -1,7 +1,7 @@ FROM registry.0xacab.org/leap/bitmask_android/android-sdk:latest LABEL Author="LEAP Encryption Access Project <info@leap.se>" -LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r21e" +LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r28c" # Make sure debconf doesn't complain about lack of interactivity ENV DEBIAN_FRONTEND noninteractive @@ -55,7 +55,7 @@ RUN echo y | sdkmanager --licenses RUN sdkmanager --list # Install Android cmake -RUN sdkmanager "cmake;3.10.2.4988404" +RUN sdkmanager "cmake;4.1.2" # Install Go environment ENV GO_VERSION=go1.24.12.linux-amd64 diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 59f6a9a4..fd35be0c 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -1,7 +1,7 @@ -FROM 0xacab.org:4567/leap/docker/debian:bullseye_amd64 +FROM 0xacab.org:4567/leap/docker/debian:bookworm_amd64 LABEL Author="LEAP Encryption Access Project <info@leap.se>" -LABEL Description="Android SDK baseimage based on debian:bullseye" Vendor="LEAP" Version="33.0.0" +LABEL Description="Android SDK baseimage based on debian:bookworm" Vendor="LEAP" Version="35.0.0" # ------------------------------------------------------ # --- Install System Dependencies @@ -24,7 +24,7 @@ RUN apt-get update -qq && \ # the basics curl unzip git locales \ # java stuff \ - openjdk-17-jdk maven && \ + openjdk-21-jdk maven && \ apt-get clean && \ apt-get autoclean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -81,10 +81,10 @@ RUN echo y | sdkmanager "platform-tools" # echo y to accept google licenses RUN sdkmanager "extras;android;m2repository" # Install Build Tools (Please keep in descending order) -RUN sdkmanager "build-tools;34.0.0" +RUN sdkmanager "build-tools;35.0.0" # Install Target SDK Packages (Please keep in descending order) -RUN sdkmanager "platforms;android-34" +RUN sdkmanager "platforms;android-35" RUN echo "accept all licenses" # Accept all licenses |