From ff8716d35cd659dfaa59bacf059009d2c2bbba12 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 25 Sep 2017 23:15:39 +0200 Subject: update ics-openvpn: update Dockerfiles, add new api level 26 and update ndk --- docker/android-emulator/Dockerfile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'docker/android-emulator/Dockerfile') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 0201312b..7cdd9b3e 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -3,14 +3,26 @@ FROM 0xacab.org:4567/leap/bitmask_android/android-sdk:latest MAINTAINER LEAP Encryption Access Project LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="25" +# Make sure debconf doesn't complain about lack of interactivity +ENV DEBIAN_FRONTEND noninteractive +# ensure GL compatibility +ENV ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 + # ------------------------------------------------------ # --- System Dependencies -# ensure GL compatibility +# Need docker package in order to do Docker-in-Docker (DIND) +RUN apt-get update -qq && \ + apt-get -y dist-upgrade && \ + apt-get -y install gnupg apt-transport-https +RUN echo 'deb https://apt.dockerproject.org/repo debian-stretch main'> /etc/apt/sources.list.d/docker.list && \ + curl -s https://apt.dockerproject.org/gpg | apt-key add - +RUN apt-get update -qq && \ + apt-get -y install docker-engine mesa-utils && \ + apt-get clean && \ + apt-get autoclean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN apt-get update -qq -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y mesa-utils -ENV ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 # ------------------------------------------------------ # --- Install Android Emulator @@ -19,6 +31,7 @@ ENV ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 RUN echo y | sdkmanager "emulator" # Install System Images for emulators +RUN echo y | sdkmanager "system-images;android-26;google_apis;x86_64" 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" -- cgit v1.2.3