From 7e3a3507804c6508d6eae7726541d60cbdc99308 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Mon, 4 Apr 2016 17:36:19 +0200
Subject: [PATCH] Remove GRADLE_VERSION
---
Dockerfile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index eecb835..8236c30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,9 @@ 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 GRADLE_VERSION "2.12"
-ENV PATH "$PATH:/sdk/tools/templates/gradle/wrapper:/sdk/tools/"
-ENV DEBIAN_FRONTEND noninteractive
ENV ANDROID_HOME "/sdk"
+ENV PATH "$PATH:${ANDROID_HOME}/tools"
+ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && \
apt-get install -y --no-install-recommends \
@@ -31,6 +30,6 @@ RUN rm -f /etc/ssl/certs/java/cacerts; \
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 /sdk
+ mv /android-sdk-linux ${ANDROID_HOME}
-RUN (while [ 1 ]; do sleep 5; echo y; done) | /sdk/tools/android update sdk -u -a -t ${SDK_PACKAGES}
+RUN (while [ 1 ]; do sleep 5; echo y; done) | ${ANDROID_HOME}/tools/android update sdk -u -a -t ${SDK_PACKAGES}
--
GitLab