Use explicit branch and godep

Dockerfile

@@ -12,7 +12,7 @@ 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
+## Install Qt5.4 (not required for CLI)
 # RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y
 # RUN apt-get update -y
 # RUN apt-get install -y qt54quickcontrols qt54webengine mesa-common-dev libglu1-mesa-dev
@@ -26,11 +26,15 @@ RUN tar -C /usr/local -xzf go*.tar.gz && go version
 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/...
+RUN go get -v github.com/tools/godep
+RUN go get -v -d github.com/ethereum/go-ethereum/...
 WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum
-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 git checkout develop
+RUN godep restore
 RUN go install -v ./cmd/ethereum
 
 ## Run & expose JSON RPC
-ENTRYPOINT ["ethereum", "-rpc=true", "-rpcport=8080"]
+ENTRYPOINT ["ethereum", "-rpc=true", "-rpcport=8545"]
-EXPOSE 8080
+EXPOSE 8545
+
+