Install rustup from apk on alpine (#731)

* Install rustup from apk on alpine

* for fedora as well

* Remove armv7l Alpine runner image from workflow

the rust in it doesn't work

Author: alex

.github/workflows/build-docker-images.yml

@@ -73,7 +73,6 @@ jobs:
 
           # armv7l distro images
           - {TAG_NAME: "cryptography-runner-ubuntu-rolling:armv7l", DOCKERFILE_PATH: "runners/ubuntu", DOCKER_PLATFORM: "linux/arm/v7", BUILD_ARGS: "RELEASE=rolling", RUNNER: "ubuntu-24.04-arm"}
-          - {TAG_NAME: "cryptography-runner-alpine:armv7l", DOCKERFILE_PATH: "runners/alpine", DOCKER_PLATFORM: "linux/arm/v7", RUNNER: "ubuntu-24.04-arm"}
 
           # armv7l manylinux images
           - {TAG_NAME: "cryptography-manylinux_2_31:armv7l", DOCKERFILE_PATH: "cryptography-linux", DOCKER_PLATFORM: "linux/arm/v7", BUILD_ARGS: "PYCA_RELEASE=manylinux_2_31_armv7l", RUNNER: "ubuntu-24.04-arm"}

runners/alpine/Dockerfile

@@ -13,12 +13,12 @@ ENV CACHE_BUSTER=1
 ENV LANG=C.UTF-8
 
 RUN apk add --no-cache git libffi-dev curl \
-    python3-dev openssl-dev bash gcc musl-dev tar pkgconfig zstd make
+    python3-dev openssl-dev bash gcc musl-dev tar pkgconfig zstd make rustup
 
 COPY --from=staticnodejs20 /out/ /staticnode/20/
 COPY --from=staticnodejs24 /out/ /staticnode/24/
 
-RUN python3 -m venv /venv && /venv/bin/pip install -U pip wheel --no-cache-dir
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal --component llvm-tools-preview
+RUN rustup-init -y --default-toolchain stable --profile minimal --component llvm-tools-preview
 ENV PATH="/root/.cargo/bin:$PATH"
+
+RUN python3 -m venv /venv && /venv/bin/pip install -U pip wheel --no-cache-dir

runners/fedora/Dockerfile

@@ -5,10 +5,10 @@ FROM registry.fedoraproject.org/fedora:latest
 ENV LANG=C.UTF-8
 
 RUN dnf install -y gcc redhat-rpm-config libffi-devel python3 \
-    python3-devel openssl-devel git findutils which pkg-config zstd && \
+    python3-devel openssl-devel git findutils which pkg-config zstd rustup && \
     dnf clean all
 
-RUN python3 -m venv /venv && /venv/bin/pip install -U pip wheel --no-cache-dir
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal --component llvm-tools-preview
+RUN rustup-init -y --default-toolchain stable --profile minimal --component llvm-tools-preview
 ENV PATH="/root/.cargo/bin:$PATH"
+
+RUN python3 -m venv /venv && /venv/bin/pip install -U pip wheel --no-cache-dir