Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded stuff from camlistore/android 

Change-Id: I397ba4bbd6567b1ce54fcab54162b6b1a1508008
This commit is contained in:
Brad Fitzpatrick 2014-02-08 17:14:02 -08:00
parent 1e56abec90
commit e364a6da4b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clients/android/devenv/Dockerfile
View File

@ -1,13 +1,20 @@
# Build environment in which to build the Camlistore Android app. # Build environment in which to build the Camlistore Android app.
#
# This builds on https://index.docker.io/u/wasabeef/android/
FROM wasabeef/android FROM wasabeef/android
MAINTAINER bradfitz <brad@danga.com> MAINTAINER bradfitz <brad@danga.com>
# 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: # But it's possible we may want to switch to using hg, in which case:
# RUN yum -y install mercurial # 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 ENV GOVERS ec5195954667
RUN cd /usr/local && curl -O http://go.googlecode.com/archive/$GOVERS.zip 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 && unzip -q $GOVERS.zip
RUN cd /usr/local && mv go-$GOVERS go 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 ANDROID_HOME /usr/local/android-sdk-linux
ENV ANT_HOME /usr/local/apache-ant-1.9.2 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/tools
ENV PATH $PATH:$ANDROID_HOME/platform-tools ENV PATH $PATH:$ANDROID_HOME/platform-tools
ENV PATH $PATH:$ANT_HOME/bin ENV PATH $PATH:$ANT_HOME/bin
ENV PATH $PATH:$MAVEN_HOME/bin
ENV PATH $PATH:$GRADLE_HOME/bin
ENV IN_DOCKER 1 ENV IN_DOCKER 1