diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-01 17:48:50 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-01 17:48:50 +0100 |
| commit | 0161973d77ead085f99dc64d8a6dfb2ff3d192c0 (patch) | |
| tree | e9f517c5794dac172b7cdaa468259d27a9219bf8 /docker | |
| parent | 6c9a6fae70ef35d2e04466f4118e1572b38bccfc (diff) | |
| parent | a43778e930041ab26e4d70348553fb98c3f6872d (diff) | |
Merge branch '#8818_tests_for_drawer' into #8832_update_ics-openvpn
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/android-emulator/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/android-sdk/Dockerfile | 7 |
2 files changed, 6 insertions, 8 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 diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index fbb63aa8..3218d369 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -59,14 +59,11 @@ 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;26.0.0" +RUN sdkmanager "build-tools;27.0.3" RUN sdkmanager "build-tools;25.0.2" -RUN sdkmanager "build-tools;25.0.0" -RUN sdkmanager "build-tools;24.0.3" RUN sdkmanager "build-tools;23.0.3" # Install Target SDK Packages (Please keep in descending order) -RUN sdkmanager "platforms;android-26" +RUN sdkmanager "platforms;android-27" RUN sdkmanager "platforms;android-25" -RUN sdkmanager "platforms;android-24" RUN sdkmanager "platforms;android-23" |