Update build-docker-images.yml

pyca · Sep 22, 2023 · 22cd861 · 22cd861
1 parent 2b5c118
commit 22cd861
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
@@ -61,7 +61,6 @@ jobs:
           - {TAG_NAME: "cryptography-runner-alpine:aarch64", DOCKERFILE_PATH: "runners/alpine", RUNNER: [self-hosted, Linux, ARM64]}
 
           - {TAG_NAME: "cryptography-runner-ubuntu-jammy:arm32", DOCKERFILE_PATH: "runners/ubuntu", BUILD_ARGS: "--platform=linux/arm/v7 --build-arg RELEASE=jammy", RUNNER: [self-hosted, Linux, ARM64]}
-          - {TAG_NAME: "cryptography-runner-alpine:arm32", DOCKERFILE_PATH: "runners/alpine", BUILD_ARGS: "--platform=linux/arm/v7", RUNNER: [self-hosted, Linux, ARM64]}
 
     name: "${{ matrix.IMAGE.TAG_NAME }}"
     steps:

diff --git a/runners/ubuntu/Dockerfile b/runners/ubuntu/Dockerfile
@@ -26,5 +26,7 @@ RUN apt-get -qq update && apt-get install -qq -y \
 
 RUN python3 -m venv /venv && /venv/bin/pip install -U pip wheel --no-cache-dir
 
+# Work around https://github.com/rust-lang/rustup/issues/3122
+ENV RUSTUP_USE_CURL 1
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal --component llvm-tools-preview
 ENV PATH="/root/.cargo/bin:$PATH"