From 43b929d242b405b47a0760c6d14cc866ae594424 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 12:42:15 -0400 Subject: [PATCH] update docker --- .gitignore | 1 + README.md | 2 +- docker/Dockerfile | 13 +++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 28b3dc4ff7..41ad641380 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ profile.tmp profile.cov .idea/workspace.xml +*.idea/ \ No newline at end of file diff --git a/README.md b/README.md index 7be16315d4..282a1977c2 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ master | [![Build+Status](https://build.ethdev.com/buildstatusimage?builder=L The following builds are build automatically by our build servers after each push to the [develop](https://github.com/expanse-project/go-expanse/tree/develop) branch. -* [Docker](https://registry.hub.docker.com/u/expanse/client-go/) +* [Docker](https://registry.hub.docker.com/u/expanse/go-expanse/) * [OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/Mist-OSX-latest.dmg) * Ubuntu [trusty](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-trusty/latest/) | diff --git a/docker/Dockerfile b/docker/Dockerfile index b31368c291..2e9865a4e2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:utopic -MAINTAINER caktux +MAINTAINER chrisfranko ENV DEBIAN_FRONTEND noninteractive @@ -12,11 +12,12 @@ RUN apt-get dist-upgrade -q -y RUN apt-get install -q -y unattended-upgrades # Install Expanse -RUN apt-get install -q -y software-properties-common -RUN add-apt-repository ppa:expanse/expanse -RUN add-apt-repository ppa:expanse/expanse-dev -RUN apt-get update -RUN apt-get install -q -y gexp +RUN apt-get install git binutils bison gcc make libgmp3-dev +RUN bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) +RUN go install go1.4 +RUN gvm use go1.4 --default +RUN git clone http://www.github.com/expanse-project/go-expanse.git && cd go-expanse +RUN make gexp # Install supervisor RUN apt-get install -q -y supervisor