From 7bd45f3700f54dcff753f5679374a4b525451017 Mon Sep 17 00:00:00 2001
From: Omkar Prabhu <omkkarprabuinfinity@gmail.com>
Date: Wed, 22 Jul 2020 21:13:56 +0530
Subject: [PATCH 1/2] rebased on master

---
 Dockerfile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e07c3753..d4b219d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,15 +9,20 @@ ENV GO111MODULE on
 ENV GOPROXY     https://proxy.golang.org
 
 ENV SUEXEC_VERSION v0.2
-ENV TINI_VERSION v0.16.1
-RUN set -x \
-  && cd /tmp \
+ENV TINI_VERSION v0.19.0
+RUN set -eux; \
+    dpkgArch="$(dpkg --print-architecture)"; \
+    case "${dpkgArch##*-}" in \
+        "amd64" | "armhf" | "arm64") tiniArch="tini-static-$dpkgArch" ;;\
+        *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
+    esac; \
+  cd /tmp \
   && git clone https://github.com/ncopa/su-exec.git \
   && cd su-exec \
   && git checkout -q $SUEXEC_VERSION \
-  && make \
+  && make su-exec-static \
   && cd /tmp \
-  && wget -q -O tini https://github.com/krallin/tini/releases/download/$TINI_VERSION/tini \
+  && wget -q -O tini https://github.com/krallin/tini/releases/download/$TINI_VERSION/$tiniArch \
   && chmod +x tini
 
 # Get the TLS CA certificates, they're not provided by busybox.
@@ -48,7 +53,7 @@ COPY --from=builder $GOPATH/bin/ipfs-cluster-service /usr/local/bin/ipfs-cluster
 COPY --from=builder $GOPATH/bin/ipfs-cluster-ctl /usr/local/bin/ipfs-cluster-ctl
 COPY --from=builder $GOPATH/bin/ipfs-cluster-follow /usr/local/bin/ipfs-cluster-follow
 COPY --from=builder $SRC_PATH/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
-COPY --from=builder /tmp/su-exec/su-exec /sbin/su-exec
+COPY --from=builder /tmp/su-exec/su-exec-static /sbin/su-exec
 COPY --from=builder /tmp/tini /sbin/tini
 COPY --from=builder /etc/ssl/certs /etc/ssl/certs
 

From 18e4593e99fc2d74e2443339b7db960718dabdfe Mon Sep 17 00:00:00 2001
From: Omkar Prabhu <omkkarprabuinfinity@gmail.com>
Date: Tue, 1 Sep 2020 22:57:38 +0530
Subject: [PATCH 2/2] allowing non amd64 in docker-test

---
 Dockerfile-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile-test b/Dockerfile-test
index cf949b12..1a86cc81 100644
--- a/Dockerfile-test
+++ b/Dockerfile-test
@@ -51,7 +51,7 @@ COPY --from=builder /tmp/jq-linux64 /usr/local/bin/jq
 
 # Add bash
 COPY --from=builder /bin/bash /bin/bash
-COPY --from=builder /lib/x86_64-linux-gnu/libtinfo.so* /lib64/
+COPY --from=builder /lib/*-linux-gnu*/libtinfo.so* /lib64/
 
 USER root