From e364a6da4be28eb92160528facefbf7c20d4d9dd Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sat, 8 Feb 2014 17:14:02 -0800 Subject: [PATCH] Remove unneeded stuff from camlistore/android Change-Id: I397ba4bbd6567b1ce54fcab54162b6b1a1508008 --- clients/android/devenv/Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/clients/android/devenv/Dockerfile b/clients/android/devenv/Dockerfile index fcd40cec4..9af0a8c64 100644 --- a/clients/android/devenv/Dockerfile +++ b/clients/android/devenv/Dockerfile @@ -1,13 +1,20 @@ # Build environment in which to build the Camlistore Android app. +# +# This builds on https://index.docker.io/u/wasabeef/android/ FROM wasabeef/android MAINTAINER bradfitz -# Don't need this, since we're just using the archive URL to fetch Go. +# Don't need mercurial yet, since we're just using the archive URL to fetch Go. # But it's possible we may want to switch to using hg, in which case: # RUN yum -y install mercurial +# Update the GOVERS to depend on a new version of Go. +# +# The ec5195954667 version is in the Go 1.3 dev cycle, after I fixed some net/http +# bugs (that are also worked around in Camlistore, but...) ENV GOVERS ec5195954667 + RUN cd /usr/local && curl -O http://go.googlecode.com/archive/$GOVERS.zip RUN cd /usr/local && unzip -q $GOVERS.zip RUN cd /usr/local && mv go-$GOVERS go @@ -21,10 +28,7 @@ RUN echo y | android update sdk -u -t build-tools-19.0.1 ENV ANDROID_HOME /usr/local/android-sdk-linux ENV ANT_HOME /usr/local/apache-ant-1.9.2 -ENV GRADLE_HOME /usr/local/gradle-1.9 ENV PATH $PATH:$ANDROID_HOME/tools ENV PATH $PATH:$ANDROID_HOME/platform-tools ENV PATH $PATH:$ANT_HOME/bin -ENV PATH $PATH:$MAVEN_HOME/bin -ENV PATH $PATH:$GRADLE_HOME/bin ENV IN_DOCKER 1