From 26bf95731ba7a469e13d996f291795a817cff480 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sun, 21 Dec 2014 14:31:19 -0600 Subject: Use repo default branches --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Dockerfile') 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 -- cgit v1.2.3 From 5a52e86546dfc0b30c1376f2c5feafd54de6258d Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 28 Jan 2015 11:10:16 -0600 Subject: Update go to latest version Now using git instead of mercurial --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 82ce9f7fc..726e6b71f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 ## Build and install Go -RUN hg clone -u release https://code.google.com/p/go -RUN cd go && hg update go1.4 +RUN git clone https://go.googlesource.com/go +RUN cd go && git checkout go1.4.1 RUN cd go/src && ./all.bash && go version ## Install GUI dependencies -- cgit v1.2.3 From 83b385a290ce967d88e532eec3f6d08ca92d3c58 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 28 Jan 2015 21:28:32 -0600 Subject: Separate golang source dir from GOPATH dir --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 726e6b71f..94a8f098f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,9 +13,9 @@ 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 ## Build and install Go -RUN git clone https://go.googlesource.com/go -RUN cd go && git checkout go1.4.1 -RUN cd go/src && ./all.bash && go version +RUN git clone https://go.googlesource.com/go golang +RUN cd golang && git checkout go1.4.1 +RUN cd golang/src && ./all.bash && go version ## Install GUI dependencies RUN add-apt-repository ppa:ubuntu-sdk-team/ppa -y -- cgit v1.2.3 From 0bb3943698356dd4a12c082bdcab5c6031d91d6d Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Fri, 30 Jan 2015 11:49:52 -0600 Subject: Updated for Qt5.4 --- Dockerfile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 94a8f098f..771d19746 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,39 +3,38 @@ FROM ubuntu:14.04 ## Environment setup ENV HOME /root ENV GOPATH /root/go -ENV PATH /go/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games +ENV PATH /golang/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games +ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig RUN mkdir -p /root/go ENV DEBIAN_FRONTEND noninteractive ## Install base dependencies 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 mesa-common-dev libglu1-mesa-dev -## Build and install Go +## Install Qt5.4 dependencies from PPA +RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y +RUN apt-get update -y +RUN apt-get install -y qt54quickcontrols qt54webengine + +## Build and install latest Go RUN git clone https://go.googlesource.com/go golang RUN cd golang && git checkout go1.4.1 RUN cd golang/src && ./all.bash && go version -## Install GUI dependencies -RUN add-apt-repository ppa:ubuntu-sdk-team/ppa -y -RUN apt-get update -y -RUN apt-get install -y qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev - -## 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 submodule update --init +## Fetch and install QML +RUN go get -u -v -d github.com/obscuren/qml +WORKDIR $GOPATH/src/github.com/obscuren/qml +RUN git checkout v1 RUN go install -v -# Fetch and install go-ethereum -RUN go get -v -d github.com/ethereum/go-ethereum/... +## Fetch and install go-ethereum +RUN go get -u -v -d github.com/ethereum/go-ethereum/... WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum -# 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 -# Run JSON RPC +## Run & expose JSON RPC ENTRYPOINT ["ethereum", "-rpc=true", "-rpcport=8080"] EXPOSE 8080 -- cgit v1.2.3 From 70e2df3904acf61db0d9c6805dda81c5e7fc2529 Mon Sep 17 00:00:00 2001 From: sveneh Date: Mon, 9 Feb 2015 16:27:49 +0100 Subject: Dockerfile creation speed-up by not running go tests, added a workaround so that docker's cache is invalidated whenever th git repo is updated. --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 771d19746..d2c03e7e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get install -y qt54quickcontrols qt54webengine ## Build and install latest Go RUN git clone https://go.googlesource.com/go golang RUN cd golang && git checkout go1.4.1 -RUN cd golang/src && ./all.bash && go version +RUN cd golang/src && ./make.bash && go version ## Fetch and install QML RUN go get -u -v -d github.com/obscuren/qml @@ -29,6 +29,9 @@ WORKDIR $GOPATH/src/github.com/obscuren/qml RUN git checkout v1 RUN go install -v +# 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 -u -v -d github.com/ethereum/go-ethereum/... WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum -- cgit v1.2.3 From c6af5f0a275608ea6c797ef826e6090885f24eac Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 11 Feb 2015 11:30:36 +0100 Subject: No longer switch branches for go-qml dep --- Dockerfile | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index d2c03e7e0..6e29a638d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,12 +23,6 @@ RUN git clone https://go.googlesource.com/go golang RUN cd golang && git checkout go1.4.1 RUN cd golang/src && ./make.bash && go version -## Fetch and install QML -RUN go get -u -v -d github.com/obscuren/qml -WORKDIR $GOPATH/src/github.com/obscuren/qml -RUN git checkout v1 -RUN go install -v - # 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 -- cgit v1.2.3 From d68e607aa5917b4b35c0d54bed45334fc27ac12c Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 16 Feb 2015 12:12:14 +0100 Subject: Group Qt dependencies together --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 6e29a638d..c0c41e410 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,19 +4,19 @@ FROM ubuntu:14.04 ENV HOME /root ENV GOPATH /root/go ENV PATH /golang/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games -ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig RUN mkdir -p /root/go ENV DEBIAN_FRONTEND noninteractive ## Install base dependencies 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 mesa-common-dev libglu1-mesa-dev +RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev -## Install Qt5.4 dependencies from PPA -RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y -RUN apt-get update -y -RUN apt-get install -y qt54quickcontrols qt54webengine +## Install Qt5.4 +# 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 +# ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig ## Build and install latest Go RUN git clone https://go.googlesource.com/go golang -- cgit v1.2.3 From a92bcbb7959cbefddca6475d7ac88790ba319174 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 16 Feb 2015 13:37:29 +0100 Subject: Use latest Trusty version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index c0c41e410..1962ada63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:14.04.1 ## Environment setup ENV HOME /root -- cgit v1.2.3 From 393267489cca8448e6c7e1bfe9965d7a1aab821a Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 16 Feb 2015 13:40:51 +0100 Subject: Use Go binary instead of building from source --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 1962ada63..907b96c21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,14 +3,14 @@ FROM ubuntu:14.04.1 ## Environment setup ENV HOME /root ENV GOPATH /root/go -ENV PATH /golang/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games +ENV PATH /root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games RUN mkdir -p /root/go ENV DEBIAN_FRONTEND noninteractive ## Install base dependencies 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 wget pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev ## Install Qt5.4 # RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y @@ -18,10 +18,9 @@ RUN apt-get install -y git mercurial build-essential software-properties-common # RUN apt-get install -y qt54quickcontrols qt54webengine mesa-common-dev libglu1-mesa-dev # ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig -## Build and install latest Go -RUN git clone https://go.googlesource.com/go golang -RUN cd golang && git checkout go1.4.1 -RUN cd golang/src && ./make.bash && go version +# Install Golang +RUN wget https://storage.googleapis.com/golang/go1.4.1.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 -- cgit v1.2.3 From c0ce323092bef4828a6bea385e4213ea3e9e1cd2 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Mon, 16 Feb 2015 17:00:57 +0100 Subject: Use explicit branch and godep --- Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 907b96c21..1f6555d1a 100644 --- a/Dockerfile +++ b/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"] -EXPOSE 8080 +ENTRYPOINT ["ethereum", "-rpc=true", "-rpcport=8545"] +EXPOSE 8545 + + -- cgit v1.2.3