Merge branch 'update_docker_images2' into 'master'

update to android API 34, force all docker images to be rebuilt

See merge request leap/bitmask_android!265

4 files changed, 14 insertions, 17 deletions

diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile
index 1c4d3c36..572fc2c0 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="33"
+LABEL Description="Android SDK baseimage based on debian:bullseye" Vendor="LEAP" Version="34"
 
 # Make sure debconf doesn't complain about lack of interactivity
 ENV DEBIAN_FRONTEND noninteractive
@@ -29,10 +29,7 @@ RUN apt-get update -qq && \
 # Install Android SDK emulator package
 RUN echo y | sdkmanager "emulator"
 
-# Install System Images for emulators
-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"
+# Install System Images for emulators4;google_apis;x86_64"
+RUN echo y | sdkmanager "system-images;android-34;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'
+RUN echo no | avdmanager create avd --force --name testApi34 --abi google_apis/x86_64 --package 'system-images;android-34;google_apis;x86_64'
diff --git a/docker/android-fastlane/Dockerfile b/docker/android-fastlane/Dockerfile
index cc548a8f..5c7470aa 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="3"
+LABEL Description="Android emulator image based on android-sdk" Vendor="LEAP" Version="4"
 
 # Make sure debconf doesn't complain about lack of interactivity
 ENV DEBIAN_FRONTEND noninteractive
@@ -37,6 +37,10 @@ RUN apt-get update -qq && \
     apt-get autoclean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN echo $JAVA_HOME
+RUN java --version
+
+
 # ------------------------------------------------------
 # --- Install Android Emulator
 
@@ -50,16 +54,11 @@ 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-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 y | sdkmanager "system-images;android-34;google_apis;x86_64"
 
 # fastlane wants 2 emulators. Starting happens in the scripts
-RUN echo no | avdmanager create avd --force --name testApi33 --abi google_apis/x86_64 --package 'system-images;android-33;google_apis;x86_64'
+RUN echo no | avdmanager create avd --force --name testApi34 --abi google_apis/x86_64 --package 'system-images;android-34;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'
 
 # Install Android cmake
 RUN sdkmanager "cmake;3.10.2.4988404"
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile
index 485160d4..1b5f5de2 100644
--- a/docker/android-ndk/Dockerfile
+++ b/docker/android-ndk/Dockerfile
@@ -40,6 +40,7 @@ ENV ANDROID_SDK_ROOT ${ANDROID_HOME}/latest/cmdline-tools
 RUN echo $JAVA_HOME
 RUN java --version
 
+
 RUN curl -L $ANDROID_NDK_URL -o ndk.zip  \
     && unzip ndk.zip -d $ANDROID_HOME/ndk  \
     && rm -rf ndk.zip
diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile
index 82656e3c..f146a085 100644
--- a/docker/android-sdk/Dockerfile
+++ b/docker/android-sdk/Dockerfile
@@ -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;33.0.2"
+RUN sdkmanager "build-tools;34.0.0"
 
 # Install Target SDK Packages (Please keep in descending order)
-RUN sdkmanager "platforms;android-33"
+RUN sdkmanager "platforms;android-34"
 
 RUN echo "accept all licenses"
 # Accept all licenses