aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile33
1 files changed, 16 insertions, 17 deletions
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