aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-01-24 19:46:56 +0800
committerGitHub <noreply@github.com>2017-01-24 19:46:56 +0800
commit2718b4282840347677f55d5ea7865fbae35838d6 (patch)
tree42784eb90e4d7efbe4c52903c3beca84febd55eb
parentfc52f2c007fb4a9065cd1b0ec402f7cbbae4dc5e (diff)
parent0b9070fe019a79740af3271109c6ce550911cb60 (diff)
downloadgo-tangerine-2718b4282840347677f55d5ea7865fbae35838d6.tar.gz
go-tangerine-2718b4282840347677f55d5ea7865fbae35838d6.tar.zst
go-tangerine-2718b4282840347677f55d5ea7865fbae35838d6.zip
Merge pull request #3599 from karalabe/docker-alpine-cacerts
containers/docker: update base images, add CA certs, build internally on Ubuntu
-rw-r--r--containers/docker/develop-alpine/Dockerfile4
-rw-r--r--containers/docker/develop-ubuntu/Dockerfile22
-rw-r--r--containers/docker/master-alpine/Dockerfile4
-rw-r--r--containers/docker/master-ubuntu/Dockerfile22
4 files changed, 24 insertions, 28 deletions
diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile
index 3393c4337..a8d85bc63 100644
--- a/containers/docker/develop-alpine/Dockerfile
+++ b/containers/docker/develop-alpine/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:3.4
+FROM alpine:3.5
RUN \
- apk add --update go git make gcc musl-dev && \
+ apk add --update go git make gcc musl-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 && \
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-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile
index 5131c473a..0db583a43 100644
--- a/containers/docker/master-alpine/Dockerfile
+++ b/containers/docker/master-alpine/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:3.4
+FROM alpine:3.5
RUN \
- apk add --update go git make gcc musl-dev && \
+ apk add --update go git make gcc musl-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 && \
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"]