From 5137b235e9df6d5a1a44b4d1a04f701e209b2cd8 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Tue, 1 Nov 2022 13:47:21 +0100
Subject: [PATCH 1/2] whitelist what we know works

If other people use other arch and want their builds to go faster we can
whitelist them too after they have confirmed it works.
---
 core/base/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/base/Dockerfile b/core/base/Dockerfile
index a661877b..29223182 100644
--- a/core/base/Dockerfile
+++ b/core/base/Dockerfile
@@ -45,7 +45,7 @@ RUN set -euxo pipefail \
     { \
       machine="$(uname -m)" \
     ; deps="build-base gcc libffi-dev python3-dev" \
-    ; [[ "${machine}" == armv7 ]] && \
+    ; [[ "${machine}" != x86_64 ]] && \
         deps="${deps} cargo git libressl-dev mariadb-connector-c-dev postgresql-dev" \
     ; apk add --virtual .build-deps ${deps} \
     ; [[ "${machine}" == armv7 ]] && \

From ff9f152a529e47be7bd723dada8937f1ec1957e5 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Tue, 1 Nov 2022 14:11:59 +0100
Subject: [PATCH 2/2] This may be helpful too

---
 core/base/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/base/Dockerfile b/core/base/Dockerfile
index 29223182..d5be6a90 100644
--- a/core/base/Dockerfile
+++ b/core/base/Dockerfile
@@ -48,7 +48,7 @@ RUN set -euxo pipefail \
     ; [[ "${machine}" != x86_64 ]] && \
         deps="${deps} cargo git libressl-dev mariadb-connector-c-dev postgresql-dev" \
     ; apk add --virtual .build-deps ${deps} \
-    ; [[ "${machine}" == armv7 ]] && \
+    ; [[ "${machine}" == armv7* ]] && \
         mkdir -p /root/.cargo/registry/index && \
         git clone --bare https://github.com/rust-lang/crates.io-index.git /root/.cargo/registry/index/github.com-1285ae84e5963aae \
     ; pip install -r requirements-${MAILU_DEPS}.txt \