diff options
| author | varac <varacanero@zeromail.org> | 2017-03-14 18:30:05 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-03-14 18:30:05 +0100 |
| commit | f60585b4e8822bf71d50bfbee175db2db5d1699a (patch) | |
| tree | c27371f228bf8fb856f9d659abd4e73e90e24a4a /docker/android | |
| parent | 586563735c4d69d1ecfd2120fc138f1353642278 (diff) | |
Use latest sdk version
Diffstat (limited to 'docker/android')
| -rw-r--r-- | docker/android/Dockerfile | 9 |
1 files 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 <info@leap.se> 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}" |