From d871419fc2304c6613cff38016cbde0dba186e94 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan.grewe@magicinternet.de>
Date: Mon, 11 Apr 2016 20:22:05 +0200
Subject: [PATCH] Use SDK 25.1.1
---
Dockerfile | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4388c09..33a49fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,12 @@
FROM ubuntu:15.10
MAINTAINER Jan Grewe <jan@faked.org>
-ENV SDK_VERSION "24.4.1"
-ENV SDK_PACKAGES "platform-tools,build-tools-23.0.3,android-23,addon-google_apis-google-23,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository"
+ENV VERSION_SDK_TOOLS "25.1.1"
+ENV VERSION_BUILD_TOOLS "23.0.3"
+ENV VERSION_TARGET_SDK "23"
+
+ENV SDK_PACKAGES "build-tools-${VERSION_BUILD_TOOLS},android-${VERSION_TARGET_SDK},addon-google_apis-google-${VERSION_TARGET_SDK},platform-tools,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository"
+
ENV ANDROID_HOME "/sdk"
ENV PATH "$PATH:${ANDROID_HOME}/tools"
ENV DEBIAN_FRONTEND noninteractive
@@ -24,14 +28,14 @@ RUN apt-get update && \
lib32gcc1 \
lib32ncurses5 \
lib32z1 \
+ unzip \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN rm -f /etc/ssl/certs/java/cacerts; \
/var/lib/dpkg/info/ca-certificates-java.postinst configure
-ADD http://dl.google.com/android/android-sdk_r${SDK_VERSION}-linux.tgz /sdk.tgz
-RUN tar zxvf sdk.tgz && \
- rm -v /sdk.tgz && \
- mv /android-sdk-linux ${ANDROID_HOME}
+ADD http://dl.google.com/android/repository/tools_r${VERSION_SDK_TOOLS}-linux.zip /tools.zip
+RUN unzip /tools.zip -d /sdk && \
+ rm -v /tools.zip
RUN (while [ 1 ]; do sleep 5; echo y; done) | ${ANDROID_HOME}/tools/android update sdk -u -a -t ${SDK_PACKAGES}
--
GitLab