diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-22 21:46:32 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-22 21:46:32 +0800 |
| commit | 60b1f9629cf422c4ea2244f673b90553407f1276 (patch) | |
| tree | b887bd244985f8b4360f0b0edc9aacdcd3f07013 /Dockerfile | |
| parent | 4051c0333f43765a7414a4e0e8ac51e7148b0646 (diff) | |
| parent | e531c6fc6cb9c54969a85eca6642561dff958a27 (diff) | |
| download | dexon-60b1f9629cf422c4ea2244f673b90553407f1276.tar.gz dexon-60b1f9629cf422c4ea2244f673b90553407f1276.tar.zst dexon-60b1f9629cf422c4ea2244f673b90553407f1276.zip | |
Merge branch 'develop' into poc8
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 1f37ce892..82ce9f7fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,14 +25,14 @@ RUN apt-get install -y qtbase5-private-dev qtdeclarative5-private-dev libqt5open ## Fetch and install serpent-go RUN go get -v -d github.com/ethereum/serpent-go WORKDIR $GOPATH/src/github.com/ethereum/serpent-go -RUN git checkout master +# RUN git checkout master RUN git submodule update --init RUN go install -v # Fetch and install go-ethereum RUN go get -v -d github.com/ethereum/go-ethereum/... WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum -RUN git checkout poc8 +# RUN git checkout develop RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi RUN go install -v ./cmd/ethereum |