From c6eeb410a0671b03ee74ee56c153e3e3775c2776 Mon Sep 17 00:00:00 2001 From: Jan Grewe <jan@faked.org> Date: Mon, 4 Apr 2016 16:19:14 +0200 Subject: [PATCH] Make sure that Build Tools get installed --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c262eae..b51b8cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # -# GitLab CI: Android v0.1 +# GitLab CI: Android v0.2 # # https://hub.docker.com/r/jangrewe/gitlab-ci-android/ # https://git.faked.org/jan/gitlab-ci-android @@ -9,8 +9,8 @@ FROM ubuntu:15.10 MAINTAINER Jan Grewe <jan@faked.org> ENV SDK_VERSION "24.4.1" -ENV SDK_PACKAGES "plattform-tools,build-tools-23.0.2,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.11" +ENV SDK_PACKAGES "plattform-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" @@ -33,7 +33,7 @@ RUN tar zxvf sdk.tgz && \ rm -v /sdk.tgz && \ mv /android-sdk-linux /sdk -RUN (while [ 1 ]; do sleep 5; echo y; done) | /sdk/tools/android update sdk -u --filter ${SDK_PACKAGES} +RUN (while [ 1 ]; do sleep 5; echo y; done) | /sdk/tools/android update sdk -u -a -t ${SDK_PACKAGES} RUN sed -i "s#distributionUrl=.*#distributionUrl=http\://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip#" /sdk/tools/templates/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties && \ /sdk/tools/templates/gradle/wrapper/gradlew -- GitLab