From 39a0f65bfd7e85f315c6233a948be244ddebb86b Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 6 May 2023 00:24:29 +0000
Subject: [PATCH] fix: install correct mc binary for arm64
---
containers/jug/dev.Dockerfile | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index e866d27ad..95164f143 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -188,9 +188,18 @@ COPY profile.d/z11_jug_env.sh /etc/profile.d
COPY singularity.d /.singularity.d
## Add minio client into /usr/local/bin
-## FIXME: This should download .../linux-arm64/mc for arm64.
-ADD https://dl.min.io/client/mc/release/linux-amd64/mc /usr/local/bin
-RUN chmod a+x /usr/local/bin/mc
+ADD https://dl.min.io/client/mc/release/linux-amd64/mc /usr/local/bin/mc-amd64
+ADD https://dl.min.io/client/mc/release/linux-arm64/mc /usr/local/bin/mc-arm64
+RUN declare -A target=( \
+ ["linux/amd64"]="amd64" \
+ ["linux/arm64"]="arm64" \
+ ) \
+ && mv /usr/local/bin/mc-${target[${TARGETPLATFORM}]} /usr/local/bin/mc \
+ && chmod a+x /usr/local/bin/mc \
+ && unset target[${TARGETPLATFORM}] \
+ && for t in ${target[*]} ; do \
+ rm /usr/local/bin/mc-${t} ; \
+ done
## ========================================================================================
## STAGE 3
--
GitLab