From 31d127a5cc9e5b9bff4e752559f1c96ad360ce17 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Tue, 23 Feb 2016 23:21:40 +0100
Subject: [PATCH] Abandon Alpine, i386 binaries won't run
---
Dockerfile | 62 ++++++++++++++++++++++++++++--------------------------
1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 3b67d55..4f51d2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,32 @@
-#
-# GitLab CI: Android v0.1
-#
-# https://hub.docker.com/r/jangrewe/gitlab-ci-android/
-# https://git.faked.org/jan/gitlab-ci-android
-#
-
-FROM alpine:latest
-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"
-
-RUN apk update && \
- apk upgrade && \
- apk add \
- bash \
- openjdk8 \
- && \
- rm -rf /var/cache/apk/*
-
-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 && \
- echo 'export PATH=$PATH:/sdk/tools/templates/gradle/wrapper:/sdk/tools/' >> .bashrc
-
-RUN echo "y" | /sdk/tools/android update sdk -u --filter ${SDK_PACKAGES}
+#
+# GitLab CI: Android v0.1
+#
+# https://hub.docker.com/r/jangrewe/gitlab-ci-android/
+# https://git.faked.org/jan/gitlab-ci-android
+#
+
+FROM alpine:latest
+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"
+
+RUN apk update && \
+ apk upgrade && \
+ apk add \
+ bash \
+ openjdk8 \
+ && \
+ rm -rf /var/cache/apk/*
+
+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 && \
+ echo 'export PATH=$PATH:/sdk/tools/templates/gradle/wrapper:/sdk/tools/' >> /root/.bashrc
+
+RUN echo "y" | /sdk/tools/android update sdk -u --filter ${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 && \
+ JAVA_OPTS="-Dorg.gradle.native=false" /sdk/tools/templates/gradle/wrapper/gradlew
--
GitLab