diff options
| -rw-r--r-- | docker/android-emulator/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/android-fastlane/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/android-sdk/Dockerfile | 14 |
3 files changed, 16 insertions, 12 deletions
diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 1c12cb6d..1c4d3c36 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -1,7 +1,7 @@ FROM registry.0xacab.org/leap/bitmask_android/android-sdk:latest MAINTAINER LEAP Encryption Access Project <info@leap.se> -LABEL Description="Android SDK baseimage based on debian:bullseye" Vendor="LEAP" Version="31" +LABEL Description="Android SDK baseimage based on debian:bullseye" Vendor="LEAP" Version="33" # Make sure debconf doesn't complain about lack of interactivity ENV DEBIAN_FRONTEND noninteractive @@ -30,9 +30,9 @@ RUN apt-get update -qq && \ RUN echo y | sdkmanager "emulator" # Install System Images for emulators -RUN echo y | sdkmanager "system-images;android-31;google_apis;x86_64" +RUN echo y | sdkmanager "system-images;android-33;google_apis;x86_64" # RUN echo y | sdkmanager "system-images;android-27;google_apis;x86" # RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64" # RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64" -RUN echo no | avdmanager create avd --force --name testApi31 --abi google_apis/x86_64 --package 'system-images;android-31;google_apis;x86_64' +RUN echo no | avdmanager create avd --force --name testApi33 --abi google_apis/x86_64 --package 'system-images;android-33;google_apis;x86_64' diff --git a/docker/android-fastlane/Dockerfile b/docker/android-fastlane/Dockerfile index 07240c21..cc548a8f 100644 --- a/docker/android-fastlane/Dockerfile +++ b/docker/android-fastlane/Dockerfile @@ -1,7 +1,7 @@ FROM registry.0xacab.org/leap/bitmask_android/android-sdk:latest MAINTAINER LEAP Encryption Access Project <info@leap.se> -LABEL Description="Android emulator image based on android-sdk" Vendor="LEAP" Version="2" +LABEL Description="Android emulator image based on android-sdk" Vendor="LEAP" Version="3" # Make sure debconf doesn't complain about lack of interactivity ENV DEBIAN_FRONTEND noninteractive @@ -30,7 +30,7 @@ RUN apt-get update -qq && \ RUN apt-get update -qq && \ apt-get install -y docker-ce docker-ce-cli make gcc swig file lib32stdc++6 lib32z1 \ autoconf autogen automake autopoint autotools-dev gettext-base libtool patch pkg-config po4a \ - curl git openjdk-11-jdk openjdk-11-jre-headless imagemagick libpulse0 po4a \ + curl git openjdk-17-jdk openjdk-17-jre-headless imagemagick libpulse0 po4a \ make build-essential ruby-dev imagemagick docker-ce-cli mesa-utils xvfb \ libstdc++6 libncurses5 libsdl1.2debian imagemagick libpulse-java libpulse0 libxkbcommon-x11-0 && \ apt-get clean && \ @@ -50,13 +50,13 @@ RUN echo y | sdkmanager "emulator" # Install System Images for emulators # seems like every version has its own quirks -RUN echo y | sdkmanager "system-images;android-31;google_apis;x86_64" +RUN echo y | sdkmanager "system-images;android-33;google_apis;x86_64" #RUN echo y | sdkmanager "system-images;android-27;google_apis;x86" #RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64" #RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64" # fastlane wants 2 emulators. Starting happens in the scripts -RUN echo no | avdmanager create avd --force --name testApi31 --abi google_apis/x86_64 --package 'system-images;android-31;google_apis;x86_64' +RUN echo no | avdmanager create avd --force --name testApi33 --abi google_apis/x86_64 --package 'system-images;android-33;google_apis;x86_64' # TODO: fastlane has been troublesome for newer versions, need to dive deep to update #RUN echo no | avdmanager create avd --force --name testApi27 --abi google_apis/x86_64 --package 'system-images;android-27;google_apis;x86_64' #RUN echo no | avdmanager create avd --force --name testApi27-duet --abi google_apis/x86_64 --package 'system-images;android-27;google_apis;x86_64' diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 6f996616..82656e3c 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -1,7 +1,7 @@ FROM 0xacab.org:4567/leap/docker/debian:bullseye_amd64 MAINTAINER LEAP Encryption Access Project <info@leap.se> -LABEL Description="Android SDK baseimage based on debian:bullseye" Vendor="LEAP" Version="31.0.0" +LABEL Description="Android SDK baseimage based on debian:bullseye" Vendor="LEAP" Version="33.0.0" # ------------------------------------------------------ # --- Install System Dependencies @@ -23,8 +23,8 @@ RUN apt-get update -qq && \ apt-get install -y docker-ce docker-ce-cli mesa-utils \ # the basics curl unzip git locales \ - # java stuff - openjdk-11-jdk maven && \ + # java stuff \ + openjdk-17-jdk maven && \ apt-get clean && \ apt-get autoclean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -45,6 +45,10 @@ ENV LANG en_US.UTF-8 ENV ANDROID_HOME /opt/android-sdk-linux ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip ENV ANDROID_SDK_ROOT ${ANDROID_HOME} +ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64 + +RUN echo $JAVA_HOME +RUN java --version # Install SDK Tools RUN curl -L $ANDROID_SDK_URL -o sdk-tools.zip \ @@ -77,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;31.0.0" +RUN sdkmanager "build-tools;33.0.2" # Install Target SDK Packages (Please keep in descending order) -RUN sdkmanager "platforms;android-31" +RUN sdkmanager "platforms;android-33" RUN echo "accept all licenses" # Accept all licenses |