diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:28:39 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-11 18:28:39 +0800 |
| commit | e433525f516ea4a8ec3a29381361df57acf7d512 (patch) | |
| tree | e20bae1b1a154f1e1c177b0981e68c2e8aa78408 | |
| parent | 5fe2916ee11b6d965884b058d6346d19ba3652b6 (diff) | |
| parent | ab66a3d0d3a5841664ef4b2201168f066fc77688 (diff) | |
| download | go-tangerine-e433525f516ea4a8ec3a29381361df57acf7d512.tar go-tangerine-e433525f516ea4a8ec3a29381361df57acf7d512.tar.gz go-tangerine-e433525f516ea4a8ec3a29381361df57acf7d512.tar.bz2 go-tangerine-e433525f516ea4a8ec3a29381361df57acf7d512.tar.lz go-tangerine-e433525f516ea4a8ec3a29381361df57acf7d512.tar.xz go-tangerine-e433525f516ea4a8ec3a29381361df57acf7d512.tar.zst go-tangerine-e433525f516ea4a8ec3a29381361df57acf7d512.zip | |
Merge branch 'sveneh-origin_develop' into develop
| -rw-r--r-- | Dockerfile | 5 |
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 |