From f60585b4e8822bf71d50bfbee175db2db5d1699a Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 14 Mar 2017 18:30:05 +0100 Subject: Use latest sdk version --- docker/android/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile index 48681af..68d90ac 100644 --- a/docker/android/Dockerfile +++ b/docker/android/Dockerfile @@ -1,18 +1,19 @@ -# See +# See https://about.gitlab.com/2016/11/30/setting-up-gitlab-ci-for-android-projects/ 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 "25.2.3" +ENV ANDROID_BUILD_TOOLS "25.0.1" ENV ANDROID_SDK_TOOLS "25.2.3" ENV LANG en_US.utf8 RUN apt-get --quiet update --yes \ && apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 -RUN wget --quiet --output-document=android-sdk.tgz "https://dl.google.com/android/android-sdk_r${ANDROID_SDK_TOOLS}-linux.tgz" \ - && tar --extract --gzip --file=android-sdk.tgz +RUN wget --output-document=android-sdk.zip "https://dl.google.com/android/repository/tools_r${ANDROID_SDK_TOOLS}-linux.zip" \ + && unzip android-sdk.zip && rm android-sdk.zip + 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}" -- cgit v1.2.3