diff options
| author | Felix Lange <fjl@twurst.com> | 2016-01-23 04:55:13 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-01-23 04:55:13 +0800 |
| commit | 6e6931ef73c68d1a8ae45475f7719bdc962cb2c1 (patch) | |
| tree | 45dab02cfd5fc9371afa778a9f2f7cb2a88ae9f7 | |
| parent | 78f196409552466ff878a030e4069495a923c73e (diff) | |
| parent | 896c134d309051bfc5dfd8ac99aca0bbacb946dd (diff) | |
| download | dexon-6e6931ef73c68d1a8ae45475f7719bdc962cb2c1.tar.gz dexon-6e6931ef73c68d1a8ae45475f7719bdc962cb2c1.tar.zst dexon-6e6931ef73c68d1a8ae45475f7719bdc962cb2c1.zip | |
Merge pull request #2145 from caktux/develop
separate and optimize Dockerfile for master and develop
| -rw-r--r-- | docker/Dockerfile | 21 | ||||
| -rw-r--r-- | docker/develop/Dockerfile | 17 | ||||
| -rw-r--r-- | docker/master/Dockerfile | 17 |
3 files changed, 34 insertions, 21 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index ba5b05d14..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM ubuntu:wily -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 - -# 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 - -EXPOSE 8545 -EXPOSE 30303 - -ENTRYPOINT ["/usr/bin/geth"] diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile new file mode 100644 index 000000000..98b4aadf8 --- /dev/null +++ b/docker/develop/Dockerfile @@ -0,0 +1,17 @@ +FROM ubuntu:wily +MAINTAINER caktux + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && \ + apt-get upgrade -q -y && \ + apt-get dist-upgrade -q -y && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 923F6CA9 && \ + echo "deb http://ppa.launchpad.net/ethereum/ethereum-dev/ubuntu wily main" | tee -a /etc/apt/sources.list.d/ethereum.list && \ + apt-get update && \ + apt-get install -q -y geth + +EXPOSE 8545 +EXPOSE 30303 + +ENTRYPOINT ["/usr/bin/geth"] diff --git a/docker/master/Dockerfile b/docker/master/Dockerfile new file mode 100644 index 000000000..2c6de28c9 --- /dev/null +++ b/docker/master/Dockerfile @@ -0,0 +1,17 @@ +FROM ubuntu:wily +MAINTAINER caktux + +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get update && \ + apt-get upgrade -q -y && \ + apt-get dist-upgrade -q -y && \ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 923F6CA9 && \ + echo "deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu wily main" | tee -a /etc/apt/sources.list.d/ethereum.list && \ + apt-get update && \ + apt-get install -q -y geth + +EXPOSE 8545 +EXPOSE 30303 + +ENTRYPOINT ["/usr/bin/geth"] |