Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
This commit is contained in:
		
						commit
						6c0b194382
					
				
							
								
								
									
										12
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								Dockerfile
									
									
									
									
									
								
							| @ -1,4 +1,4 @@ | ||||
| FROM ubuntu:14.04.1 | ||||
| FROM ubuntu:14.04.2 | ||||
| 
 | ||||
| ## Environment setup | ||||
| ENV HOME /root | ||||
| @ -12,22 +12,22 @@ ENV DEBIAN_FRONTEND noninteractive | ||||
| RUN apt-get update && apt-get upgrade -y | ||||
| RUN apt-get install -y git mercurial build-essential software-properties-common wget pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev | ||||
| 
 | ||||
| ## Install Qt5.4 (not required for CLI) | ||||
| # RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y | ||||
| ## Install Qt5.4.1 (not required for CLI) | ||||
| # RUN add-apt-repository ppa:beineri/opt-qt541-trusty -y | ||||
| # RUN apt-get update -y | ||||
| # RUN apt-get install -y qt54quickcontrols qt54webengine mesa-common-dev libglu1-mesa-dev | ||||
| # ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig | ||||
| 
 | ||||
| # Install Golang | ||||
| RUN wget https://storage.googleapis.com/golang/go1.4.1.linux-amd64.tar.gz | ||||
| RUN wget https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | ||||
| RUN tar -C /usr/local -xzf go*.tar.gz && go version | ||||
| 
 | ||||
| # 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 -v github.com/tools/godep | ||||
| RUN go get -v -d github.com/ethereum/go-ethereum/... | ||||
| RUN go get github.com/tools/godep | ||||
| RUN go get -d github.com/ethereum/go-ethereum/... | ||||
| WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum | ||||
| RUN git checkout develop | ||||
| RUN godep restore | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user