Merge pull request #3599 from karalabe/docker-alpine-cacerts

containers/docker: update base images, add CA certs, build internally on Ubuntu
This commit is contained in:
Péter Szilágyi 2017-01-24 13:46:56 +02:00 committed by GitHub
commit 2718b42828
4 changed files with 24 additions and 28 deletions

@ -1,7 +1,7 @@
FROM alpine:3.4 FROM alpine:3.5
RUN \ 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 && \ git clone --depth 1 https://github.com/ethereum/go-ethereum && \
(cd go-ethereum && make geth) && \ (cd go-ethereum && make geth) && \
cp go-ethereum/build/bin/geth /geth && \ cp go-ethereum/build/bin/geth /geth && \

@ -1,17 +1,15 @@
FROM ubuntu:wily FROM ubuntu:xenial
MAINTAINER caktux
ENV DEBIAN_FRONTEND noninteractive RUN \
apt-get update && apt-get upgrade -q -y && \
RUN apt-get update && \ apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \
apt-get upgrade -q -y && \ git clone --depth 1 https://github.com/ethereum/go-ethereum && \
apt-get dist-upgrade -q -y && \ (cd go-ethereum && make geth) && \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 923F6CA9 && \ cp go-ethereum/build/bin/geth /geth && \
echo "deb http://ppa.launchpad.net/ethereum/ethereum-dev/ubuntu wily main" | tee -a /etc/apt/sources.list.d/ethereum.list && \ apt-get remove -y golang git make gcc libc-dev && apt autoremove -y && apt-get clean && \
apt-get update && \ rm -rf /go-ethereum
apt-get install -q -y geth
EXPOSE 8545 EXPOSE 8545
EXPOSE 30303 EXPOSE 30303
ENTRYPOINT ["/usr/bin/geth"] ENTRYPOINT ["/geth"]

@ -1,7 +1,7 @@
FROM alpine:3.4 FROM alpine:3.5
RUN \ 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 && \ git clone --depth 1 --branch release/1.5 https://github.com/ethereum/go-ethereum && \
(cd go-ethereum && make geth) && \ (cd go-ethereum && make geth) && \
cp go-ethereum/build/bin/geth /geth && \ cp go-ethereum/build/bin/geth /geth && \

@ -1,17 +1,15 @@
FROM ubuntu:wily FROM ubuntu:xenial
MAINTAINER caktux
ENV DEBIAN_FRONTEND noninteractive RUN \
apt-get update && apt-get upgrade -q -y && \
RUN apt-get update && \ apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \
apt-get upgrade -q -y && \ git clone --depth 1 --branch release/1.5 https://github.com/ethereum/go-ethereum && \
apt-get dist-upgrade -q -y && \ (cd go-ethereum && make geth) && \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 923F6CA9 && \ cp go-ethereum/build/bin/geth /geth && \
echo "deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu wily main" | tee -a /etc/apt/sources.list.d/ethereum.list && \ apt-get remove -y golang git make gcc libc-dev && apt autoremove -y && apt-get clean && \
apt-get update && \ rm -rf /go-ethereum
apt-get install -q -y geth
EXPOSE 8545 EXPOSE 8545
EXPOSE 30303 EXPOSE 30303
ENTRYPOINT ["/usr/bin/geth"] ENTRYPOINT ["/geth"]