diff options
| author | cyBerta <cyberta@riseup.net> | 2022-08-08 00:11:37 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2022-08-08 00:11:37 +0200 |
| commit | 23ef4c290db8692465fc66c3467129cf72eafe78 (patch) | |
| tree | 77a6ad132d8b931b58a49d1b0d00928f8410fd68 | |
| parent | cdcc1e3d7b57fdddcbc0c9b9595c80719d38dc98 (diff) | |
update docker images for SDK 31, keep docker image version in sync with Android SDK version
| -rw-r--r-- | docker/android-emulator/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/android-sdk/Dockerfile | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index b5f5f32b..c30d4970 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="27" +LABEL Description="Android SDK baseimage based on debian:bullseye" Vendor="LEAP" Version="31" # 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-30;google_apis;x86" +RUN echo y | sdkmanager "system-images;android-31;google_apis;x86" # 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 testApi30 --abi google_apis/x86 --package 'system-images;android-30;google_apis;x86' +RUN echo no | avdmanager create avd --force --name testApi31 --abi google_apis/x86 --package 'system-images;android-31;google_apis;x86' diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 6093cf18..6f996616 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="27.0.0" +LABEL Description="Android SDK baseimage based on debian:bullseye" Vendor="LEAP" Version="31.0.0" # ------------------------------------------------------ # --- Install System Dependencies @@ -77,18 +77,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;30.0.3" -# RUN sdkmanager "build-tools;28.0.3" -# RUN sdkmanager "build-tools;27.0.3" -# RUN sdkmanager "build-tools;25.0.2" -# RUN sdkmanager "build-tools;23.0.3" +RUN sdkmanager "build-tools;31.0.0" # Install Target SDK Packages (Please keep in descending order) -RUN sdkmanager "platforms;android-30" -# RUN sdkmanager "platforms;android-28" -# RUN sdkmanager "platforms;android-27" -# RUN sdkmanager "platforms;android-25" -# RUN sdkmanager "platforms;android-23" +RUN sdkmanager "platforms;android-31" RUN echo "accept all licenses" # Accept all licenses |