diff options
| -rw-r--r-- | Dockerfile | 39 | ||||
| -rw-r--r-- | docker/Dockerfile | 31 | ||||
| -rw-r--r-- | docker/supervisord.conf | 23 |
3 files changed, 39 insertions, 54 deletions
diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..fcd564a34 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,39 @@ +FROM ubuntu:14.04.2 + +## Environment setup +ENV HOME /root +ENV GOPATH /root/go +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 wget pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev + +## 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.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 mkdir -p $GOPATH/src/github.com/ethereum/ +RUN git clone https://github.com/ethereum/go-ethereum $GOPATH/src/github.com/ethereum/go-ethereum +WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum +RUN git checkout develop +RUN GOPATH=$GOPATH:$GOPATH/src/github.com/ethereum/go-ethereum/Godeps/_workspace go install -v ./cmd/geth + +## Run & expose JSON RPC +ENTRYPOINT ["geth", "-rpc=true", "-rpcport=8545"] +EXPOSE 8545 + + diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index b608e4ab6..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -FROM ubuntu:utopic -MAINTAINER caktux - -ENV DEBIAN_FRONTEND noninteractive - -# Usual update / upgrade -RUN apt-get update -RUN apt-get upgrade -q -y -RUN apt-get dist-upgrade -q -y - -# Let our containers upgrade themselves -RUN apt-get install -q -y unattended-upgrades - -# Install Ethereum -RUN apt-get install -q -y software-properties-common -RUN add-apt-repository ppa:ethereum/ethereum -RUN add-apt-repository ppa:ethereum/ethereum-dev -RUN apt-get update -RUN apt-get install -q -y geth - -# Install supervisor -RUN apt-get install -q -y supervisor - -# Add supervisor configs -ADD supervisord.conf supervisord.conf - -EXPOSE 8545 -EXPOSE 30303 - -CMD ["-n", "-c", "/supervisord.conf"] -ENTRYPOINT ["/usr/bin/supervisord"] diff --git a/docker/supervisord.conf b/docker/supervisord.conf deleted file mode 100644 index 33cba0c14..000000000 --- a/docker/supervisord.conf +++ /dev/null @@ -1,23 +0,0 @@ -[supervisord] -nodaemon=false - -[program:geth] -priority=30 -directory=/ -command=geth --rpc -user=root -autostart=true -autorestart=true -startsecs=10 -stopsignal=QUIT -stdout_logfile=/var/log/geth.log -stderr_logfile=/var/log/geth.err - -[unix_http_server] -file=%(here)s/supervisor.sock - -[supervisorctl] -serverurl=unix://%(here)s/supervisor.sock - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
\ No newline at end of file |