From a82122949902ec1d784e4928342c4d55b4622702 Mon Sep 17 00:00:00 2001
From: "Michael Bradley, Jr" <michaelsbradleyjr@gmail.com>
Date: Wed, 22 Aug 2018 16:41:50 -0500
Subject: [PATCH] downgrade geth/swarm (1.8.12 geth alltools includes swarm)

---
 Dockerfile | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1c0e5dd..bac70f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG BUILDER_BASE_IMAGE=buildpack-deps
 ARG BUILDER_BASE_TAG=stretch
 ARG EMBARK_VERSION=latest
 ARG GANACHE_VERSION=6.1.0
-ARG GETH_VERSION=1.8.13-225171a4
+ARG GETH_VERSION=1.8.12-37685930
 ARG IPFS_VERSION=0.4.17
 ARG MICRO_VERSION=1.4.1
 ARG NODE_VERSION=8.11.3
@@ -15,7 +15,6 @@ ARG NODEENV_VERSION=1.3.2
 ARG NPM_VERSION=6.4.0
 ARG NVM_VERSION=0.33.11
 ARG SUEXEC_VERSION=0.2
-ARG SWARM_VERSION=0.3.1-225171a4
 
 # multi-stage builder images
 # ------------------------------------------------------------------------------
@@ -83,16 +82,6 @@ RUN git clone --branch v${SUEXEC_VERSION} \
     && cd su-exec \
     && make
 
-# ------------------------------------------------------------------------------
-
-FROM builder-base as builder-swarm
-ARG SWARM_VERSION
-RUN export url="https://gethstore.blob.core.windows.net/builds" \
-    && export platform="swarm-linux-amd64" \
-    && curl -fsSLO --compressed "${url}/${platform}-${SWARM_VERSION}.tar.gz" \
-    && tar -xvzf swarm* \
-    && rm swarm*/COPYING
-
 # final image
 # ------------------------------------------------------------------------------
 
@@ -154,7 +143,6 @@ ARG GETH_VERSION
 ARG IPFS_VERSION
 ARG MICRO_VERSION
 ARG SUEXEC_VERSION
-ARG SWARM_VERSION
 ENV __CODESET=${__CODESET} \
     __LANG=${__LANG} \
     __LANGUAGE=${__LANGUAGE} \
@@ -169,8 +157,7 @@ ENV __CODESET=${__CODESET} \
     MICRO_VERSION=${MICRO_VERSION} \
     NODEENV_VERSION=${NODEENV_VERSION} \
     NVM_VERSION=${NVM_VERSION} \
-    SUEXEC_VERSION=${SUEXEC_VERSION} \
-    SWARM_VERSION=${SWARM_VERSION}
+    SUEXEC_VERSION=${SUEXEC_VERSION}
 SHELL ["/bin/sh", "-c"]
 USER root
 WORKDIR /dapp
@@ -185,7 +172,6 @@ EXPOSE 5001 8000 8080 8500 8545 8546 8555 8556 30301/udp 30303
 COPY --from=builder-geth /geth-alltools* /usr/local/bin/
 COPY --from=builder-micro /micro*/micro /usr/local/bin/
 COPY --from=builder-suexec /su-exec/su-exec /usr/local/bin/
-COPY --from=builder-swarm /swarm* /usr/local/bin/
 COPY env/docker-entrypoint.sh \
      env/user-entrypoint.sh \
      env/install-extras.sh \