From 9fb8a85039423668f4a80e34f3d971ca4f5cd776 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Sat, 13 Nov 2021 12:42:02 +0100
Subject: [PATCH] Fix up dockerfiles so they work for e.g. armv7 too

---
 packaging/Dockerfile      | 3 +--
 packaging/Dockerfile.rust | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packaging/Dockerfile b/packaging/Dockerfile
index 49c5a17..cf40e79 100644
--- a/packaging/Dockerfile
+++ b/packaging/Dockerfile
@@ -9,8 +9,7 @@ COPY ./squid/mitm-myself.sh /root
 RUN /root/mitm-myself.sh ${http_proxy_hostname}
 
 ARG http_proxy
-RUN http_proxy=${http_proxy} https_proxy=${http_proxy} apk add bash sudo alpine-sdk linux-headers \
-    rustup openssl-dev
+RUN http_proxy=${http_proxy} https_proxy=${http_proxy} apk add bash sudo alpine-sdk linux-headers
 
 ARG UID
 ARG BUILD_USER
diff --git a/packaging/Dockerfile.rust b/packaging/Dockerfile.rust
index 8a9fb3f..64b1cc3 100644
--- a/packaging/Dockerfile.rust
+++ b/packaging/Dockerfile.rust
@@ -3,6 +3,8 @@ ARG DOCKER_ARCH
 FROM --platform=linux/${DOCKER_ARCH} synit-build:${ALPINE_ARCH}
 
 ARG http_proxy
+RUN http_proxy=${http_proxy} https_proxy=${http_proxy} apk add rustup openssl-dev
+
 # Running without proxy for now, to ensure reasonable freshness and consistency:
 #   RUN http_proxy=${http_proxy} https_proxy=${http_proxy} rustup-init -y --default-toolchain nightly
 #