diff options
| author | Janos Guljas <janos@resenje.org> | 2018-02-09 19:23:30 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2018-02-22 21:23:17 +0800 |
| commit | a3a07350dcef0ba39829a20d8ddba4bd3463d293 (patch) | |
| tree | 100f2515cadd92105537a12e6981fab2193435ee /containers/docker | |
| parent | 820cf09c98706f71d4b02b6c25e62db15830f3fb (diff) | |
| parent | 1a4e68721a901e86322631fed1191025a6d14c52 (diff) | |
| download | go-tangerine-a3a07350dcef0ba39829a20d8ddba4bd3463d293.tar go-tangerine-a3a07350dcef0ba39829a20d8ddba4bd3463d293.tar.gz go-tangerine-a3a07350dcef0ba39829a20d8ddba4bd3463d293.tar.bz2 go-tangerine-a3a07350dcef0ba39829a20d8ddba4bd3463d293.tar.lz go-tangerine-a3a07350dcef0ba39829a20d8ddba4bd3463d293.tar.xz go-tangerine-a3a07350dcef0ba39829a20d8ddba4bd3463d293.tar.zst go-tangerine-a3a07350dcef0ba39829a20d8ddba4bd3463d293.zip | |
swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Diffstat (limited to 'containers/docker')
| -rw-r--r-- | containers/docker/develop-alpine/Dockerfile | 2 | ||||
| -rw-r--r-- | containers/docker/develop-ubuntu/Dockerfile | 6 | ||||
| -rw-r--r-- | containers/docker/master-alpine/Dockerfile | 2 | ||||
| -rw-r--r-- | containers/docker/master-ubuntu/Dockerfile | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index d239129d5..1f3e1112e 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ diff --git a/containers/docker/develop-ubuntu/Dockerfile b/containers/docker/develop-ubuntu/Dockerfile index c79becb55..8c4fe9f59 100644 --- a/containers/docker/develop-ubuntu/Dockerfile +++ b/containers/docker/develop-ubuntu/Dockerfile @@ -1,12 +1,14 @@ FROM ubuntu:xenial +ENV PATH=/usr/lib/go-1.9/bin:$PATH + RUN \ apt-get update && apt-get upgrade -q -y && \ - apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \ + apt-get install -y --no-install-recommends golang-1.9 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 && \ + apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ rm -rf /go-ethereum EXPOSE 8545 diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile index 44402361d..c7b71c726 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ diff --git a/containers/docker/master-ubuntu/Dockerfile b/containers/docker/master-ubuntu/Dockerfile index cc4fad10c..bba70abfd 100644 --- a/containers/docker/master-ubuntu/Dockerfile +++ b/containers/docker/master-ubuntu/Dockerfile @@ -1,12 +1,14 @@ FROM ubuntu:xenial +ENV PATH=/usr/lib/go-1.9/bin:$PATH + RUN \ apt-get update && apt-get upgrade -q -y && \ - apt-get install -y --no-install-recommends golang git make gcc libc-dev ca-certificates && \ + apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ git clone --depth 1 --branch release/1.7 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 && \ + apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ rm -rf /go-ethereum EXPOSE 8545 |