diff options
| author | cyBerta <cyberta@riseup.net> | 2017-09-25 23:15:39 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2017-09-29 08:56:24 +0200 |
| commit | ff8716d35cd659dfaa59bacf059009d2c2bbba12 (patch) | |
| tree | 06915c4951deccfe4f4de73c42dfeb0c984fc15b /docker/android-sdk | |
| parent | e0aa1cd978f978ed3ac90adaf8415b60ce039c79 (diff) | |
update ics-openvpn: update Dockerfiles, add new api level 26 and update ndk
Diffstat (limited to 'docker/android-sdk')
| -rw-r--r-- | docker/android-sdk/Dockerfile | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 4044a7ec..0c1184a7 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -1,17 +1,29 @@ -FROM debian:stretch +FROM 0xacab.org:4567/leap/docker/debian:stretch_amd64 MAINTAINER LEAP Encryption Access Project <info@leap.se> -LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="25.2.5" +LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="26.0.0" # ------------------------------------------------------ # --- Install System Dependencies -RUN apt-get update -qq -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ - # the basics - curl unzip git locales \ - # java stuff - openjdk-8-jdk maven + Make sure debconf doesn't complain about lack of interactivity +ENV DEBIAN_FRONTEND noninteractive + +# 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 install -y docker-engine \ + # the basics + curl unzip git locales \ + # java stuff + openjdk-8-jdk maven && \ + apt-get clean && \ + apt-get autoclean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # ------------------------------------------------------ # --- Set Locales @@ -27,9 +39,8 @@ ENV LANG en_US.UTF-8 # ------------------------------------------------------ # --- Install Android SDK Tools -ENV ANDROID_SDK_VERSION "25.2.5" ENV ANDROID_HOME /opt/android-sdk-linux -ENV ANDROID_SDK_URL https://dl.google.com/android/repository/tools_r${ANDROID_SDK_VERSION}-linux.zip +ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip # Install SDK Tools RUN curl -L $ANDROID_SDK_URL -o sdk-tools.zip \ @@ -49,17 +60,14 @@ 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;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-25" RUN sdkmanager "platforms;android-24" RUN sdkmanager "platforms;android-23" - -# ------------------------------------------------------ -# --- Cleanup - -RUN apt clean |