From 1f895d5f82de3afee546870022ff477b49cc60d9 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Wed, 16 Nov 2022 11:53:52 +0100
Subject: [PATCH] ghostwheel42's suggestion

---
 core/base/Dockerfile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/core/base/Dockerfile b/core/base/Dockerfile
index 1ddffc1b..4972d303 100644
--- a/core/base/Dockerfile
+++ b/core/base/Dockerfile
@@ -14,13 +14,8 @@ RUN set -euxo pipefail \
   ; addgroup -Sg ${MAILU_GID} mailu \
   ; adduser -Sg ${MAILU_UID} -G mailu -h /app -g "mailu app" -s /bin/bash mailu \
   ; apk add --no-cache bash ca-certificates curl python3 tzdata \
-  ; if [[ "$TARGETPLATFORM" == 'linux/arm/v7' ]]; then exit;fi \
-  ; machine="$(uname -m)" \
-  ; if [[ "${machine}" == x86_64 || "${machine}" == armv8* || "${machine}" == aarch64 ]] \
-  ; then \
-      echo "Installing hardened-malloc" \
-  ;   apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing hardened-malloc \
-  ; fi
+  ; ! [[ "${TARGETPLATFORM}" != linux/arm/v7 && \( "${machine}" == x86_64 || "${machine}" == armv8* || "${machine}" == aarch64 \) ]] \
+    || apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing hardened-malloc
 
 ENV LD_PRELOAD=/usr/lib/libhardened_malloc.so