Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

This commit is contained in:
obscuren 2015-01-28 18:37:04 +01:00
commit 957f80c623

View File

@ -13,8 +13,8 @@ RUN apt-get update && apt-get upgrade -y
RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev
## Build and install Go ## Build and install Go
RUN hg clone -u release https://code.google.com/p/go RUN git clone https://go.googlesource.com/go
RUN cd go && hg update go1.4 RUN cd go && git checkout go1.4.1
RUN cd go/src && ./all.bash && go version RUN cd go/src && ./all.bash && go version
## Install GUI dependencies ## Install GUI dependencies