From d039fe856d98f0065fec5feebcc74138a4c21add Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@panubo.com>
Date: Mon, 19 Jun 2023 17:54:19 +1000
Subject: [PATCH] Remove unnessesary .s6-svscan dir and add s6 arm64 support

---
 Dockerfile           | 28 ++++++++++++++++++++--------
 s6/.s6-svscan/finish |  1 -
 2 files changed, 20 insertions(+), 9 deletions(-)
 delete mode 120000 s6/.s6-svscan/finish

diff --git a/Dockerfile b/Dockerfile
index 3411a8c..30867a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,16 +24,28 @@ RUN set -x \
 # Install s6
 RUN set -x \
   && S6_VERSION=2.11.0.0 \
-  && S6_CHECKSUM=fcf79204c1957016fc88b0ad7d98f150071483583552103d5822cbf56824cc87 \
   && EXECLINE_VERSION=2.8.1.0 \
-  && EXECLINE_CHECKSUM=b216cfc4db928729d950df5a354aa34bc529e8250b55ab0de700193693dea682 \
   && SKAWARE_RELEASE=2.0.7 \
-  && curl -sSf -L https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/s6-${S6_VERSION}-linux-amd64-bin.tar.gz -o /tmp/s6-${S6_VERSION}-linux-amd64-bin.tar.gz \
-  && curl -sSf -L https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/execline-${EXECLINE_VERSION}-linux-amd64-bin.tar.gz -o /tmp/execline-${EXECLINE_VERSION}-linux-amd64-bin.tar.gz \
-  && printf "%s  %s\n" "${S6_CHECKSUM}" "s6-${S6_VERSION}-linux-amd64-bin.tar.gz" "${EXECLINE_CHECKSUM}" "execline-${EXECLINE_VERSION}-linux-amd64-bin.tar.gz" > /tmp/SHA256SUM \
-  && ( cd /tmp; sha256sum -c SHA256SUM; ) \
-  && tar -C /usr -zxf /tmp/s6-${S6_VERSION}-linux-amd64-bin.tar.gz \
-  && tar -C /usr -zxf /tmp/execline-${EXECLINE_VERSION}-linux-amd64-bin.tar.gz \
+  && S6_CHECKSUM_X86_64=fcf79204c1957016fc88b0ad7d98f150071483583552103d5822cbf56824cc87 \
+  && S6_CHECKSUM_AARCH64=64151e136f887c6c2c7df69e3100573c318ec7400296680cc698bc7b0ca36943 \
+  && EXECLINE_CHECKSUM_X86_64=b216cfc4db928729d950df5a354aa34bc529e8250b55ab0de700193693dea682 \
+  && EXECLINE_CHECKSUM_AARCH64=8cb1d5c2d44cb94990d63023db48f7d3cd71ead10cbb19c05b99dbd528af5748 \
+  && if [ "$(uname -m)" = "x86_64" ] ; then \
+        S6_CHECKSUM="${S6_CHECKSUM_X86_64}"; \
+        EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_X86_64}"; \
+        SKAWARE_ARCH="amd64"; \
+      elif [ "$(uname -m)" = "aarch64" ]; then \
+        S6_CHECKSUM="${S6_CHECKSUM_AARCH64}"; \
+        EXECLINE_CHECKSUM="${EXECLINE_CHECKSUM_AARCH64}"; \
+        SKAWARE_ARCH="aarch64"; \
+      fi \
+  && curl -sSf -L -o /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
+  && curl -sSf -L -o /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz https://github.com/just-containers/skaware/releases/download/v${SKAWARE_RELEASE}/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
+  && echo "${S6_CHECKSUM}  s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" > /tmp/SHA256SUM \
+  && echo "${EXECLINE_CHECKSUM}  execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz" >> /tmp/SHA256SUM \
+  && ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected S6: $(sha256sum s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz) Execline: $(sha256sum execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz)"; exit 1; )) \
+  && tar -C /usr -zxf /tmp/s6-${S6_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
+  && tar -C /usr -zxf /tmp/execline-${EXECLINE_VERSION}-linux-${SKAWARE_ARCH}-bin.tar.gz \
   && rm -rf /tmp/* \
   ;
 
diff --git a/s6/.s6-svscan/finish b/s6/.s6-svscan/finish
deleted file mode 120000
index 63b10de..0000000
--- a/s6/.s6-svscan/finish
+++ /dev/null
@@ -1 +0,0 @@
-/bin/true
\ No newline at end of file