From 2af83e62dc7155301960fdcb8c31599cf88062a4 Mon Sep 17 00:00:00 2001
From: "Michael Bradley, Jr" <michaelsbradleyjr@gmail.com>
Date: Thu, 25 Oct 2018 07:17:46 -0500
Subject: [PATCH] separate swarm version/install in relation to newer geth
 version

---
 Dockerfile | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 12ef18e..aedcece 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ ARG NODEENV_VERSION=1.3.2
 ARG NPM_VERSION=6.4.1
 ARG NVM_VERSION=0.33.11
 ARG SUEXEC_VERSION=0.2
+ARG SWARM_VERSION=0.3.5-8bbe7207
 
 # multi-stage builder images
 # ------------------------------------------------------------------------------
@@ -81,6 +82,16 @@ 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
 # ------------------------------------------------------------------------------
 
@@ -141,6 +152,7 @@ ARG GETH_VERSION
 ARG IPFS_VERSION
 ARG MICRO_VERSION
 ARG SUEXEC_VERSION
+ARG SWARM_VERSION
 ENV __CODESET=${__CODESET} \
     __LANG=${__LANG} \
     __LANGUAGE=${__LANGUAGE} \
@@ -155,7 +167,8 @@ ENV __CODESET=${__CODESET} \
     MICRO_VERSION=${MICRO_VERSION} \
     NODEENV_VERSION=${NODEENV_VERSION} \
     NVM_VERSION=${NVM_VERSION} \
-    SUEXEC_VERSION=${SUEXEC_VERSION}
+    SUEXEC_VERSION=${SUEXEC_VERSION} \
+    SWARM_VERSION=${SWARM_VERSION}
 SHELL ["/bin/sh", "-c"]
 USER root
 WORKDIR /dapp
@@ -170,6 +183,7 @@ 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 \