aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorcaktux <caktux@gmail.com>2015-10-27 06:06:19 +0800
committercaktux <caktux@gmail.com>2015-10-27 06:06:19 +0800
commit57ab1473887b4eaeac2ec6912e3d738d4839b48a (patch)
tree9574b88c657cc9462e74d8affc3745dabf8993f4 /docker
parent3b4ffacd0c63952ceda96b3fafb050c91e72b420 (diff)
downloadgo-tangerine-57ab1473887b4eaeac2ec6912e3d738d4839b48a.tar
go-tangerine-57ab1473887b4eaeac2ec6912e3d738d4839b48a.tar.gz
go-tangerine-57ab1473887b4eaeac2ec6912e3d738d4839b48a.tar.bz2
go-tangerine-57ab1473887b4eaeac2ec6912e3d738d4839b48a.tar.lz
go-tangerine-57ab1473887b4eaeac2ec6912e3d738d4839b48a.tar.xz
go-tangerine-57ab1473887b4eaeac2ec6912e3d738d4839b48a.tar.zst
go-tangerine-57ab1473887b4eaeac2ec6912e3d738d4839b48a.zip
update Dockerfile, remove supervisord and unattended-upgrades
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile14
-rw-r--r--docker/supervisord.conf23
2 files changed, 2 insertions, 35 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b608e4ab6..ba5b05d14 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:utopic
+FROM ubuntu:wily
MAINTAINER caktux
ENV DEBIAN_FRONTEND noninteractive
@@ -8,9 +8,6 @@ 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
@@ -18,14 +15,7 @@ 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"]
+ENTRYPOINT ["/usr/bin/geth"]
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