diff options
| author | fupduck <fupduck@riseup.net> | 2018-02-06 05:53:09 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-02-06 05:53:09 -0800 |
| commit | edd34192484f4eb618fdcc2a68b18168c155d63c (patch) | |
| tree | d884f63e74911d2ea2cf7bc864414a623e15a2b3 /docker/android-emulator/Dockerfile | |
| parent | c0848bac7ac44f4b09f9e5d66ab71f079cb0f514 (diff) | |
| parent | d2d61a16fd2a3ea0fd42073de98d1311b184444d (diff) | |
Merge branch '#8832_update_ics-openvpn' into '0.9.8'
#8832 update ics openvpn
See merge request leap/bitmask_android!33
Diffstat (limited to 'docker/android-emulator/Dockerfile')
| -rw-r--r-- | docker/android-emulator/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index bececd08..97150799 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -1,7 +1,7 @@ FROM 0xacab.org:4567/leap/bitmask_android/android-sdk:latest MAINTAINER LEAP Encryption Access Project <info@leap.se> -LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="25" +LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="26" # Make sure debconf doesn't complain about lack of interactivity ENV DEBIAN_FRONTEND noninteractive @@ -31,7 +31,8 @@ RUN apt-get update -qq && \ RUN echo y | sdkmanager "emulator" # Install System Images for emulators -RUN echo y | sdkmanager "system-images;android-26;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-24;google_apis;x86_64" RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64" + +RUN echo no | avdmanager create avd --force --name testApi27 --abi google_apis/x86 --package 'system-images;android-27;google_apis;x86'
\ No newline at end of file |