From 742b0e0ff7cae0d0f4f048919a9d29285a72364b Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 09:40:25 -0400 Subject: [PATCH] update testnet block update docker update docker file docker update 2 oi docker again --- .gitignore | 1 + README.md | 2 +- docker/Dockerfile | 15 +++++++++------ expanse_genesis.json | 2 +- 4 files changed, 12 insertions(+), 8 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..b19907f347 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,14 @@ 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 -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 +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 git checkout develop +RUN make gexp # Install supervisor RUN apt-get install -q -y supervisor diff --git a/expanse_genesis.json b/expanse_genesis.json index 96df5bbb5a..102238f697 100644 --- a/expanse_genesis.json +++ b/expanse_genesis.json @@ -8,6 +8,6 @@ "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000", "coinbase": "0x90c4384bb05d96d2f54b27e0102da5240f7833ae", "alloc": { - "0x90c4384bb05d96d2f54b27e0102da5240f7833ae": { "balance": "1000000000000000000000000" } + "0x90c4384bb05d96d2f54b27e0102da5240f7833ae": { "balance": "100000000000000000000000000000" } } } \ No newline at end of file