aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--containers/docker/develop-alpine/Dockerfile2
-rw-r--r--containers/docker/develop-ubuntu/Dockerfile6
-rw-r--r--containers/docker/master-alpine/Dockerfile2
-rw-r--r--containers/docker/master-ubuntu/Dockerfile6
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