Merge branch 'develop' of https://github.com/expanse-project/go-expanse into develop

Conflicts:
	docker/Dockerfile

docker/Dockerfile

@@ -13,13 +13,19 @@ RUN apt-get install -q -y unattended-upgrades
 
 # Install Expanse
 RUN apt-get install -q -y curl git mercurial binutils bison gcc make libgmp3-dev build-essential
-RUN curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer | bash
+
-RUN source /root/.gvm/scripts/gvm
+# Install Go
-RUN go install go1.4
+RUN \
-RUN gvm use go1.4 --default
+  mkdir -p /goroot && \
-RUN git clone http://www.github.com/expanse-project/go-expanse.git && cd go-expanse
+  curl https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar xvzf - -C /goroot --strip-components=1
-RUN git checkout develop
+
-RUN make gexp
+# Set environment variables.
+ENV GOROOT /goroot
+ENV GOPATH /gopath
+ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH
+
+RUN git clone http://www.github.com/expanse-project/go-expanse.git
+RUN cd go-expanse && git checkout develop && make gexp
 
 # Install supervisor
 RUN apt-get install -q -y supervisor

docker/supervisord.conf

@@ -3,8 +3,8 @@ nodaemon=false
 
 [program:gexp]
 priority=30
-directory=/
+directory=~/go-expanse/
-command=gexp --rpc
+command=build/bin/gexp --rpc
 user=root
 autostart=true
 autorestart=true

expanse-buildbot

@@ -0,0 +1 @@
+Subproject commit bce4905f5b10f3940303033747bce866f3d46057