From 4c1abcb0ce057e1df989256e757407ccb2e5d498 Mon Sep 17 00:00:00 2001 From: yep Date: Mon, 25 Jul 2016 16:28:40 +0200 Subject: [PATCH 1/2] containers/docker: use shallow clone of single branch --- containers/docker/develop-alpine/Dockerfile | 3 +-- containers/docker/master-alpine/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index 70aee9f0f..7f3b7f8c5 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -2,8 +2,7 @@ FROM alpine:3.4 RUN \ apk add --update go git make gcc musl-dev && \ - git clone https://github.com/ethereum/go-ethereum && \ - (cd go-ethereum && git checkout develop) && \ + git clone --depth 1 --branch develop https://github.com/ethereum/go-ethereum && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev && \ diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile index ffccd43e2..fa529671e 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.4 RUN \ apk add --update go git make gcc musl-dev && \ - git clone https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 https://github.com/ethereum/go-ethereum && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev && \ From a4215f469c736513f2fcb66b578faef822402549 Mon Sep 17 00:00:00 2001 From: yep Date: Mon, 25 Jul 2016 16:31:48 +0200 Subject: [PATCH 2/2] containers/docker: whitespace changes only, make future diffs more readable --- containers/docker/develop-alpine/Dockerfile | 8 ++++---- containers/docker/master-alpine/Dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index 7f3b7f8c5..f3247d178 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -1,11 +1,11 @@ FROM alpine:3.4 RUN \ - apk add --update go git make gcc musl-dev && \ + apk add --update go git make gcc musl-dev && \ git clone --depth 1 --branch develop https://github.com/ethereum/go-ethereum && \ - (cd go-ethereum && make geth) && \ - cp go-ethereum/build/bin/geth /geth && \ - apk del go git make gcc musl-dev && \ + (cd go-ethereum && make geth) && \ + cp go-ethereum/build/bin/geth /geth && \ + apk del go git make gcc musl-dev && \ rm -rf /go-ethereum && rm -rf /var/cache/apk/* EXPOSE 8545 diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile index fa529671e..3393c4337 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -1,11 +1,11 @@ FROM alpine:3.4 RUN \ - apk add --update go git make gcc musl-dev && \ + apk add --update go git make gcc musl-dev && \ git clone --depth 1 https://github.com/ethereum/go-ethereum && \ - (cd go-ethereum && make geth) && \ - cp go-ethereum/build/bin/geth /geth && \ - apk del go git make gcc musl-dev && \ + (cd go-ethereum && make geth) && \ + cp go-ethereum/build/bin/geth /geth && \ + apk del go git make gcc musl-dev && \ rm -rf /go-ethereum && rm -rf /var/cache/apk/* EXPOSE 8545