aboutsummaryrefslogtreecommitdiffstats
path: root/containers/docker
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-01-23 18:12:38 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-01-23 18:12:38 +0800
commit0b9070fe019a79740af3271109c6ce550911cb60 (patch)
tree32bf511e421f9ba3836b8e7189da0f5f28b77f78 /containers/docker
parentc04598f2b09ab66204b30b1c9242b4dfadcd6bdd (diff)
downloadgo-tangerine-0b9070fe019a79740af3271109c6ce550911cb60.tar
go-tangerine-0b9070fe019a79740af3271109c6ce550911cb60.tar.gz
go-tangerine-0b9070fe019a79740af3271109c6ce550911cb60.tar.bz2
go-tangerine-0b9070fe019a79740af3271109c6ce550911cb60.tar.lz
go-tangerine-0b9070fe019a79740af3271109c6ce550911cb60.tar.xz
go-tangerine-0b9070fe019a79740af3271109c6ce550911cb60.tar.zst
go-tangerine-0b9070fe019a79740af3271109c6ce550911cb60.zip
containers/docker: update ubuntu images to build, not pull
Diffstat (limited to 'containers/docker')
-rw-r--r--containers/docker/develop-ubuntu/Dockerfile22
-rw-r--r--containers/docker/master-ubuntu/Dockerfile22
2 files changed, 20 insertions, 24 deletions
diff --git a/containers/docker/develop-ubuntu/Dockerfile b/containers/docker/develop-ubuntu/Dockerfile
index 98b4aadf8..c79becb55 100644
--- a/containers/docker/develop-ubuntu/Dockerfile
+++ b/containers/docker/develop-ubuntu/Dockerfile
@@ -1,17 +1,15 @@
-FROM ubuntu:wily
-MAINTAINER caktux
+FROM ubuntu:xenial
-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
+RUN \
+ apt-get update && apt-get upgrade -q -y && \
+ apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \
+ git clone --depth 1 https://github.com/ethereum/go-ethereum && \
+ (cd go-ethereum && make geth) && \
+ cp go-ethereum/build/bin/geth /geth && \
+ apt-get remove -y golang git make gcc libc-dev && apt autoremove -y && apt-get clean && \
+ rm -rf /go-ethereum
EXPOSE 8545
EXPOSE 30303
-ENTRYPOINT ["/usr/bin/geth"]
+ENTRYPOINT ["/geth"]
diff --git a/containers/docker/master-ubuntu/Dockerfile b/containers/docker/master-ubuntu/Dockerfile
index 2c6de28c9..877ae94e9 100644
--- a/containers/docker/master-ubuntu/Dockerfile
+++ b/containers/docker/master-ubuntu/Dockerfile
@@ -1,17 +1,15 @@
-FROM ubuntu:wily
-MAINTAINER caktux
+FROM ubuntu:xenial
-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
+RUN \
+ apt-get update && apt-get upgrade -q -y && \
+ apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \
+ git clone --depth 1 --branch release/1.5 https://github.com/ethereum/go-ethereum && \
+ (cd go-ethereum && make geth) && \
+ cp go-ethereum/build/bin/geth /geth && \
+ apt-get remove -y golang git make gcc libc-dev && apt autoremove -y && apt-get clean && \
+ rm -rf /go-ethereum
EXPOSE 8545
EXPOSE 30303
-ENTRYPOINT ["/usr/bin/geth"]
+ENTRYPOINT ["/geth"]