From 5c302325f7debca68daf1a7f6f2a74d758351d5c Mon Sep 17 00:00:00 2001
From: nicobo <nicobo@users.noreply.github.com>
Date: Mon, 18 Jan 2021 08:03:07 +0100
Subject: [PATCH] - rustup does not exit for arm on alpine

---
 alpine.Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
index fa4db12..89ec199 100644
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -32,15 +32,14 @@ RUN apk add --no-cache build-base gcc abuild binutils cmake \
     # See https://cryptography.io/en/latest/installation.html#alpine for cryptography dependencies
     gcc musl-dev python3-dev libffi-dev libressl-dev \
     zip make \
-    # cargo rust \
+    # Rust is a requirement to build the 'cryptography' Python module
+    # At the time of writing this only exists for aarch64 (arm64) and x86_64
+    # => using the alpine package rather than the "universal" rustup script
+    # https://forge.rust-lang.org/infra/other-installation-methods.html
+    cargo rust \
     # git required by setuptools-scm during 'pip install'
     git
 
-# Rust is a requirement to build the 'cryptography' Python module
-# Installs rust using the recommended 'rustup' method (vs apt-get,
-# which seems to be less portable / outdated)
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-
 WORKDIR /usr/src/app
 
 COPY . .