From cbf7147409eee665eb82287e135d75fb54dece81 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 09:40:25 -0400 Subject: [PATCH 01/14] update testnet block --- expanse_genesis.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 43b929d242b405b47a0760c6d14cc866ae594424 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 12:42:15 -0400 Subject: [PATCH 02/14] 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 From f530fb815095a90bfbfbe9322af6849b7a32eb16 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 12:51:01 -0400 Subject: [PATCH 03/14] update docker file --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2e9865a4e2..cf781c87c5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 git binutils bison gcc make libgmp3-dev +RUN apt-get install -q -s 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 git checkout develop RUN make gexp # Install supervisor From 338fcf7b3da1ccf6336adffa8806ce5d11131807 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 13:14:41 -0400 Subject: [PATCH 04/14] docker update 2 --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index cf781c87c5..6ee5b71f6e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,8 +12,8 @@ RUN apt-get dist-upgrade -q -y RUN apt-get install -q -y unattended-upgrades # Install Expanse -RUN apt-get install -q -s git binutils bison gcc make libgmp3-dev -RUN bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer) +RUN apt-get install -q -s 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 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 From 2e7a411dd0049e6d4c4d6b010ff8cdbac53e60e6 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 13:21:46 -0400 Subject: [PATCH 05/14] oi --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6ee5b71f6e..7edfcfde95 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get dist-upgrade -q -y RUN apt-get install -q -y unattended-upgrades # Install Expanse -RUN apt-get install -q -s curl git mercurial binutils bison gcc make libgmp3-dev build-essential +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 go install go1.4 RUN gvm use go1.4 --default From 82267ab8120716d36279f5b764297c143a35ed1a Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 13:31:48 -0400 Subject: [PATCH 06/14] docker again --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7edfcfde95..b19907f347 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,6 +14,7 @@ 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 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 From 742b0e0ff7cae0d0f4f048919a9d29285a72364b Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 09:40:25 -0400 Subject: [PATCH 07/14] 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 From d02ab42248273d9a33afde8252cb024e531cc636 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 15:32:29 -0400 Subject: [PATCH 08/14] docker2 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b19907f347..30d9529aa0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ 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 +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 From 48ad425cb3be1239ce161a33dceb6f907c19c5f2 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 16:17:12 -0400 Subject: [PATCH 09/14] docker3 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 30d9529aa0..0aaeca6861 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ 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 +RUN /bin/bash -c "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 From 80a7885a9e4fa63446ba74dbe3b6136e3d80657b Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 16:30:29 -0400 Subject: [PATCH 10/14] fixed gvm --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0aaeca6861..fc75216781 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get install -q -y unattended-upgrades 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 /bin/bash -c "source /root/.gvm/scripts/gvm" -RUN go install go1.4 +RUN gvm 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 From a0c09ab5ced8a0f55506b58bf7898838a564673d Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 16:48:29 -0400 Subject: [PATCH 11/14] docker change --- docker/Dockerfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index fc75216781..b650a889c0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,10 +13,17 @@ 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 /bin/bash -c "source /root/.gvm/scripts/gvm" -RUN gvm install go1.4 -RUN gvm use go1.4 --default + +# Install Go +RUN \ + mkdir -p /goroot && \ + curl https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar xvzf - -C /goroot --strip-components=1 + +# 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 && cd go-expanse RUN git checkout develop RUN make gexp From 9964835efdb429a819ae269fe4f6420658856aee Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 16:59:59 -0400 Subject: [PATCH 12/14] docking is meh --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b650a889c0..4b3dc7e0a0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,7 +24,8 @@ 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 && cd go-expanse +RUN git clone http://www.github.com/expanse-project/go-expanse.git +RUN cd go-expanse RUN git checkout develop RUN make gexp From 93da39a0b970dce3fd62c7e2a55bb78839c97921 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 17:19:31 -0400 Subject: [PATCH 13/14] i hate docker --- docker/Dockerfile | 4 +--- docker/supervisord.conf | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4b3dc7e0a0..31ac2eba20 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,9 +25,7 @@ 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 -RUN git checkout develop -RUN make gexp +RUN cd go-expanse && git checkout develop && make develop # Install supervisor RUN apt-get install -q -y supervisor diff --git a/docker/supervisord.conf b/docker/supervisord.conf index d5d1da6fd4..0ad1d5978e 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -3,8 +3,8 @@ nodaemon=false [program:gexp] priority=30 -directory=/ -command=gexp --rpc +directory=~/go-expanse/ +command=build/bin/gexp --rpc user=root autostart=true autorestart=true From da507bc9dafa4f895b3fdc509e01cfe890b0a331 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Thu, 3 Sep 2015 17:36:57 -0400 Subject: [PATCH 14/14] dockingsucks --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 31ac2eba20..861d82a602 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,7 +25,7 @@ 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 develop +RUN cd go-expanse && git checkout develop && make gexp # Install supervisor RUN apt-get install -q -y supervisor