From 131fa99d2be873f514591c0a4086c74e3650f32e Mon Sep 17 00:00:00 2001 From: Samuel dos Santos Date: Sat, 11 Aug 2018 07:00:58 +0100 Subject: [PATCH 1/6] Add files via upload Alpine 3.8 with support to Go 1.10 --- alpine3.8/Dockerfile | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 alpine3.8/Dockerfile diff --git a/alpine3.8/Dockerfile b/alpine3.8/Dockerfile new file mode 100644 index 0000000000..ac330fee71 --- /dev/null +++ b/alpine3.8/Dockerfile @@ -0,0 +1,32 @@ +FROM alpine:3.8 + +RUN apk add --no-cache --update \ + ca-certificates \ + gcc \ + git \ + go \ + linux-headers \ + make \ + musl-dev + + +RUN git clone --depth 1 https://github.com/ethereum/go-ethereum &&\ + cd go-ethereum &&\ + make geth &&\ + cp go-ethereum/build/bin/geth /geth + + +RUN apk del \ + gcc \ + git \ + go \ + linux-headers \ + make \ + musl-dev &&\ + rm -rf /go-ethereum &&\ + rm -rf /var/cache/apk/* + +EXPOSE 8545 +EXPOSE 30303 + +ENTRYPOINT ["/geth"] From c6879b32d0ebf94cc19c45157c95aff96333ecce Mon Sep 17 00:00:00 2001 From: Samuel dos Santos Date: Sun, 12 Aug 2018 10:52:26 +0100 Subject: [PATCH 2/6] Add files via upload Remove the ENV variable from the Dockerfile. Fix Dockerfile for alpine3.8 --- alpine3.8/Dockerfile | 18 ++++++++---------- ubuntu-xenial/Dockerfile | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 ubuntu-xenial/Dockerfile diff --git a/alpine3.8/Dockerfile b/alpine3.8/Dockerfile index ac330fee71..4381aa0926 100644 --- a/alpine3.8/Dockerfile +++ b/alpine3.8/Dockerfile @@ -7,23 +7,21 @@ RUN apk add --no-cache --update \ go \ linux-headers \ make \ - musl-dev - - -RUN git clone --depth 1 https://github.com/ethereum/go-ethereum &&\ - cd go-ethereum &&\ + musl-dev &&\ + #Clone + git clone --depth 1 https://github.com/ethereum/go-ethereum &&\ + cd /go-ethereum &&\ make geth &&\ - cp go-ethereum/build/bin/geth /geth - - -RUN apk del \ + cp /go-ethereum/build/bin/geth /geth &&\ + #CleanUp + apk del \ gcc \ git \ go \ linux-headers \ make \ musl-dev &&\ - rm -rf /go-ethereum &&\ + rm -rf ~/go-ethereum &&\ rm -rf /var/cache/apk/* EXPOSE 8545 diff --git a/ubuntu-xenial/Dockerfile b/ubuntu-xenial/Dockerfile new file mode 100644 index 0000000000..8a0cd07449 --- /dev/null +++ b/ubuntu-xenial/Dockerfile @@ -0,0 +1,35 @@ +FROM ubuntu:xenial + +ENV PATH=/usr/lib/go-1.10/bin:$PATH + +RUN apt-get update &&\ + apt-get upgrade -q -y &&\ + apt-get install -y --no-install-recommends \ + ca-certificates \ + gcc \ + git \ + golang-1.10 \ + libc-dev \ + make &&\ + #Clone and build + git clone --depth 1 \ + https://github.com/ethereum/go-ethereum &&\ + cd /go-ethereum &&\ + make geth &&\ + cp /go-ethereum/build/bin/geth /geth &&\ + #Cleanup + apt-get remove -y \ + golang-1.10 \ + git \ + make \ + gcc \ + libc-dev &&\ + apt-get autoremove -y &&\ + apt-get clean &&\ + rm -rf /go-ethereum + +EXPOSE 8545 +EXPOSE 30303 + +ENTRYPOINT ["/geth"] + From 6e28ac87d66e82a78d250cf1fc14f46b26478e50 Mon Sep 17 00:00:00 2001 From: Samuel dos Santos Date: Sun, 12 Aug 2018 10:55:01 +0100 Subject: [PATCH 3/6] Add files via upload --- containers/docker/alpine3.8/Dockerfile | 30 +++++++++++++++++++ containers/docker/ubuntu-xenial/Dockerfile | 35 ++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 containers/docker/alpine3.8/Dockerfile create mode 100644 containers/docker/ubuntu-xenial/Dockerfile diff --git a/containers/docker/alpine3.8/Dockerfile b/containers/docker/alpine3.8/Dockerfile new file mode 100644 index 0000000000..4381aa0926 --- /dev/null +++ b/containers/docker/alpine3.8/Dockerfile @@ -0,0 +1,30 @@ +FROM alpine:3.8 + +RUN apk add --no-cache --update \ + ca-certificates \ + gcc \ + git \ + go \ + linux-headers \ + make \ + musl-dev &&\ + #Clone + git clone --depth 1 https://github.com/ethereum/go-ethereum &&\ + cd /go-ethereum &&\ + make geth &&\ + cp /go-ethereum/build/bin/geth /geth &&\ + #CleanUp + apk del \ + gcc \ + git \ + go \ + linux-headers \ + make \ + musl-dev &&\ + rm -rf ~/go-ethereum &&\ + rm -rf /var/cache/apk/* + +EXPOSE 8545 +EXPOSE 30303 + +ENTRYPOINT ["/geth"] diff --git a/containers/docker/ubuntu-xenial/Dockerfile b/containers/docker/ubuntu-xenial/Dockerfile new file mode 100644 index 0000000000..8a0cd07449 --- /dev/null +++ b/containers/docker/ubuntu-xenial/Dockerfile @@ -0,0 +1,35 @@ +FROM ubuntu:xenial + +ENV PATH=/usr/lib/go-1.10/bin:$PATH + +RUN apt-get update &&\ + apt-get upgrade -q -y &&\ + apt-get install -y --no-install-recommends \ + ca-certificates \ + gcc \ + git \ + golang-1.10 \ + libc-dev \ + make &&\ + #Clone and build + git clone --depth 1 \ + https://github.com/ethereum/go-ethereum &&\ + cd /go-ethereum &&\ + make geth &&\ + cp /go-ethereum/build/bin/geth /geth &&\ + #Cleanup + apt-get remove -y \ + golang-1.10 \ + git \ + make \ + gcc \ + libc-dev &&\ + apt-get autoremove -y &&\ + apt-get clean &&\ + rm -rf /go-ethereum + +EXPOSE 8545 +EXPOSE 30303 + +ENTRYPOINT ["/geth"] + From 607cc2101351a1baa5415ad5ab245a880bd7626d Mon Sep 17 00:00:00 2001 From: Samuel dos Santos Date: Sun, 12 Aug 2018 10:59:21 +0100 Subject: [PATCH 4/6] Delete Dockerfile File added incorrectly to this location. --- ubuntu-xenial/Dockerfile | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 ubuntu-xenial/Dockerfile diff --git a/ubuntu-xenial/Dockerfile b/ubuntu-xenial/Dockerfile deleted file mode 100644 index 8a0cd07449..0000000000 --- a/ubuntu-xenial/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM ubuntu:xenial - -ENV PATH=/usr/lib/go-1.10/bin:$PATH - -RUN apt-get update &&\ - apt-get upgrade -q -y &&\ - apt-get install -y --no-install-recommends \ - ca-certificates \ - gcc \ - git \ - golang-1.10 \ - libc-dev \ - make &&\ - #Clone and build - git clone --depth 1 \ - https://github.com/ethereum/go-ethereum &&\ - cd /go-ethereum &&\ - make geth &&\ - cp /go-ethereum/build/bin/geth /geth &&\ - #Cleanup - apt-get remove -y \ - golang-1.10 \ - git \ - make \ - gcc \ - libc-dev &&\ - apt-get autoremove -y &&\ - apt-get clean &&\ - rm -rf /go-ethereum - -EXPOSE 8545 -EXPOSE 30303 - -ENTRYPOINT ["/geth"] - From e27e05001b67f19825cfa37adb3ac3dd7880ca55 Mon Sep 17 00:00:00 2001 From: Samuel dos Santos Date: Sun, 12 Aug 2018 11:00:10 +0100 Subject: [PATCH 5/6] Delete Dockerfile File added incorrectly to this location. --- alpine3.8/Dockerfile | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 alpine3.8/Dockerfile diff --git a/alpine3.8/Dockerfile b/alpine3.8/Dockerfile deleted file mode 100644 index 4381aa0926..0000000000 --- a/alpine3.8/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM alpine:3.8 - -RUN apk add --no-cache --update \ - ca-certificates \ - gcc \ - git \ - go \ - linux-headers \ - make \ - musl-dev &&\ - #Clone - git clone --depth 1 https://github.com/ethereum/go-ethereum &&\ - cd /go-ethereum &&\ - make geth &&\ - cp /go-ethereum/build/bin/geth /geth &&\ - #CleanUp - apk del \ - gcc \ - git \ - go \ - linux-headers \ - make \ - musl-dev &&\ - rm -rf ~/go-ethereum &&\ - rm -rf /var/cache/apk/* - -EXPOSE 8545 -EXPOSE 30303 - -ENTRYPOINT ["/geth"] From 5b99ca96b36ae51cd1fddb7254dc0b795ca8b397 Mon Sep 17 00:00:00 2001 From: Samuel dos Santos Date: Sun, 12 Aug 2018 14:07:11 +0100 Subject: [PATCH 6/6] containers/docker: add support to go1.10 --- containers/docker/alpine3.8/Dockerfile | 4 ++-- containers/docker/ubuntu-xenial/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/docker/alpine3.8/Dockerfile b/containers/docker/alpine3.8/Dockerfile index 4381aa0926..da351c7d44 100644 --- a/containers/docker/alpine3.8/Dockerfile +++ b/containers/docker/alpine3.8/Dockerfile @@ -7,8 +7,8 @@ RUN apk add --no-cache --update \ go \ linux-headers \ make \ - musl-dev &&\ - #Clone + musl-dev &&\ + #Clone and build git clone --depth 1 https://github.com/ethereum/go-ethereum &&\ cd /go-ethereum &&\ make geth &&\ diff --git a/containers/docker/ubuntu-xenial/Dockerfile b/containers/docker/ubuntu-xenial/Dockerfile index 8a0cd07449..8430ce2c3a 100644 --- a/containers/docker/ubuntu-xenial/Dockerfile +++ b/containers/docker/ubuntu-xenial/Dockerfile @@ -17,7 +17,7 @@ RUN apt-get update &&\ cd /go-ethereum &&\ make geth &&\ cp /go-ethereum/build/bin/geth /geth &&\ - #Cleanup + #CleanUp apt-get remove -y \ golang-1.10 \ git \