aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-02-11 18:03:40 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-02-11 18:03:40 +0800
commitab66a3d0d3a5841664ef4b2201168f066fc77688 (patch)
treee20bae1b1a154f1e1c177b0981e68c2e8aa78408
parent5fe2916ee11b6d965884b058d6346d19ba3652b6 (diff)
parent70e2df3904acf61db0d9c6805dda81c5e7fc2529 (diff)
downloaddexon-ab66a3d0d3a5841664ef4b2201168f066fc77688.tar.gz
dexon-ab66a3d0d3a5841664ef4b2201168f066fc77688.tar.zst
dexon-ab66a3d0d3a5841664ef4b2201168f066fc77688.zip
Merge branch 'origin_develop' of https://github.com/sveneh/go-ethereum into sveneh-origin_develop
-rw-r--r--Dockerfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 771d19746..d2c03e7e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get install -y qt54quickcontrols qt54webengine
## Build and install latest Go
RUN git clone https://go.googlesource.com/go golang
RUN cd golang && git checkout go1.4.1
-RUN cd golang/src && ./all.bash && go version
+RUN cd golang/src && ./make.bash && go version
## Fetch and install QML
RUN go get -u -v -d github.com/obscuren/qml
@@ -29,6 +29,9 @@ WORKDIR $GOPATH/src/github.com/obscuren/qml
RUN git checkout v1
RUN go install -v
+# this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes
+ADD https://api.github.com/repos/ethereum/go-ethereum/git/refs/heads/develop file_does_not_exist
+
## Fetch and install go-ethereum
RUN go get -u -v -d github.com/ethereum/go-ethereum/...
WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum