From 586563735c4d69d1ecfd2120fc138f1353642278 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 14 Mar 2017 18:02:41 +0100 Subject: Use 25.2.3 sdk tools, remove unwanted stuff --- docker/android/Dockerfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile index 7743911..48681af 100644 --- a/docker/android/Dockerfile +++ b/docker/android/Dockerfile @@ -1,11 +1,12 @@ +# See FROM openjdk:8-jdk MAINTAINER LEAP Encryption Access Project LABEL Description="Android baseimage based on openjdk:8-jdk" Vendor="LEAP" Version="1.x" ENV ANDROID_COMPILE_SDK "25" -ENV ANDROID_BUILD_TOOLS "24.0.0" -ENV ANDROID_SDK_TOOLS "24.4.1" +ENV ANDROID_BUILD_TOOLS "25.2.3" +ENV ANDROID_SDK_TOOLS "25.2.3" ENV LANG en_US.utf8 RUN apt-get --quiet update --yes \ @@ -15,11 +16,7 @@ RUN wget --quiet --output-document=android-sdk.tgz "https://dl.google.com/androi RUN echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter "android-${ANDROID_COMPILE_SDK}" RUN echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter platform-tools RUN echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter "build-tools-${ANDROID_BUILD_TOOLS}" -RUN echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-android-m2repository -RUN echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-google_play_services -RUN echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter extra-google-m2repository RUN export ANDROID_HOME="$PWD/android-sdk-linux" RUN export PATH="$PATH:$PWD/android-sdk-linux/platform-tools/" -RUN chmod +x ./gradlew RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -- cgit v1.2.3