From 4812c12488b77884b2e162fb9c0a76ffb6aca79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 20 Apr 2015 11:49:44 +0300 Subject: [PATCH] Dockerfile: remove some packages, direct download vs git --- Dockerfile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d7a59fd1b..b7466d396d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,28 +8,32 @@ ENV DEBIAN_FRONTEND noninteractive ## Install base dependencies RUN apt-get update && apt-get upgrade -y && \ - apt-get install -y git mercurial build-essential software-properties-common wget \ - pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev --no-install-recommends + apt-get install -y build-essential software-properties-common wget pkg-config \ + libgmp3-dev unzip --no-install-recommends ## Install Qt5.4.1 (not required for CLI) # RUN add-apt-repository ppa:beineri/opt-qt541-trusty -y && \ # apt-get install -y qt54quickcontrols qt54webengine mesa-common-dev libglu1-mesa-dev # ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig -# Install Go, dump the race detector +# Install Go, dump the tarball and race detector RUN wget https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz && \ tar -C /usr/local -xzf go*.tar.gz && \ - rm -rf /usr/local/go/pkg/linux_amd64_race && \ + rm -rf go*.tar.gz /usr/local/go/pkg/linux_amd64_race && \ go version # 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 mkdir -p $GOPATH/src/github.com/ethereum/ && \ - git clone https://github.com/ethereum/go-ethereum $GOPATH/src/github.com/ethereum/go-ethereum && \ - cd $GOPATH/src/github.com/ethereum/go-ethereum && \ - git checkout develop && \ +RUN mkdir -p $GOPATH/src/github.com/ethereum && \ + cd $GOPATH/src/github.com/ethereum && \ + \ + wget https://github.com/ethereum/go-ethereum/archive/develop.zip && \ + unzip *.zip && mv go-ethereum-develop go-ethereum && \ + rm -f *.zip && \ + \ + cd go-ethereum && \ GOPATH=$GOPATH:$GOPATH/src/github.com/ethereum/go-ethereum/Godeps/_workspace go install -v ./cmd/geth ## Run & expose JSON RPC