diff options
| author | cyberta <cyberta@riseup.net> | 2023-11-23 08:50:28 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2023-11-23 08:50:28 +0000 |
| commit | ce8106f60d83ee2a788f1920437a0bbd48d6b15f (patch) | |
| tree | 53ca5557b931df8812803451806a073972ad86e2 /docker/android-emulator/Dockerfile | |
| parent | a9fb12c34a67092616d6b38a07bd1cfe7a493e24 (diff) | |
| parent | 1446da412010ea533b72dc9d0861729459328f3d (diff) | |
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
Diffstat (limited to 'docker/android-emulator/Dockerfile')
| -rw-r--r-- | docker/android-emulator/Dockerfile | 11 |
1 files changed, 4 insertions, 7 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' |