From 2b5c118f129ac2b8a5d30ebd290e207c056ae672 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 22 Sep 2023 16:26:55 -0400 Subject: [PATCH 1/8] Build arm32 containers --- .github/workflows/build-docker-images.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index 415f5f13..108c9a1c 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -60,6 +60,9 @@ jobs: - {TAG_NAME: "cryptography-runner-ubuntu-jammy:aarch64", DOCKERFILE_PATH: "runners/ubuntu", BUILD_ARGS: "--build-arg RELEASE=jammy", RUNNER: [self-hosted, Linux, ARM64]} - {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: - uses: actions/checkout@v4.0.0 From 22cd86116de88f2ef93dfc580cc33327e917467b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 22 Sep 2023 16:40:54 -0400 Subject: [PATCH 2/8] Update build-docker-images.yml --- .github/workflows/build-docker-images.yml | 1 - runners/ubuntu/Dockerfile | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index 108c9a1c..da5fb908 100644 --- 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 index b556d4f7..4c30ccbe 100644 --- 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" From 06d3543bfb2220db42a897fd43d3481cf5205eb6 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 22 Sep 2023 17:16:26 -0400 Subject: [PATCH 3/8] Debug --- runners/ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runners/ubuntu/Dockerfile b/runners/ubuntu/Dockerfile index 4c30ccbe..f197a1e0 100644 --- a/runners/ubuntu/Dockerfile +++ b/runners/ubuntu/Dockerfile @@ -28,5 +28,5 @@ 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 +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal --component llvm-tools-preview -v ENV PATH="/root/.cargo/bin:$PATH" From cf38011c725acafec53af88a86273490f3d9d1e3 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 22 Sep 2023 17:30:37 -0400 Subject: [PATCH 4/8] Debug --- runners/ubuntu/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/runners/ubuntu/Dockerfile b/runners/ubuntu/Dockerfile index f197a1e0..955dfa6f 100644 --- a/runners/ubuntu/Dockerfile +++ b/runners/ubuntu/Dockerfile @@ -28,5 +28,6 @@ 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 cat /proc/cpuinfo RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal --component llvm-tools-preview -v ENV PATH="/root/.cargo/bin:$PATH" From 1784987caef971e7af92aebee89d64ad3cf13501 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 22 Sep 2023 17:38:24 -0400 Subject: [PATCH 5/8] Debug --- .github/workflows/build-docker-images.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index da5fb908..3a494f6a 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -65,6 +65,8 @@ jobs: name: "${{ matrix.IMAGE.TAG_NAME }}" steps: - uses: actions/checkout@v4.0.0 + - run: docker version + # Pull the previous image, but if it fails return true anyway. # Sometimes we add new docker images and if they've never been pushed # they can't be pulled. From f577ff672da9cf8e7031defc32b406c2847f0d2c Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 19 Feb 2024 08:44:50 -0500 Subject: [PATCH 6/8] Update Dockerfile --- runners/ubuntu/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runners/ubuntu/Dockerfile b/runners/ubuntu/Dockerfile index 955dfa6f..2d802f6f 100644 --- a/runners/ubuntu/Dockerfile +++ b/runners/ubuntu/Dockerfile @@ -27,7 +27,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 cat /proc/cpuinfo +# ENV RUSTUP_USE_CURL 1 +ENV RUSTUP_UPDATE_ROOT https://dev-static.rust-lang.org/rustup RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal --component llvm-tools-preview -v ENV PATH="/root/.cargo/bin:$PATH" From 27b0c94c8b3f5252539f7ee37d2863f3bfb516af Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 11 Mar 2024 23:52:47 -0400 Subject: [PATCH 7/8] Update Dockerfile --- runners/ubuntu/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/runners/ubuntu/Dockerfile b/runners/ubuntu/Dockerfile index 2d802f6f..a351382c 100644 --- a/runners/ubuntu/Dockerfile +++ b/runners/ubuntu/Dockerfile @@ -28,6 +28,5 @@ 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 -ENV RUSTUP_UPDATE_ROOT https://dev-static.rust-lang.org/rustup RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal --component llvm-tools-preview -v ENV PATH="/root/.cargo/bin:$PATH" From 6226db5b09bd76e4addca2a6f50e6852311434de Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 11 Mar 2024 23:57:52 -0400 Subject: [PATCH 8/8] Update Dockerfile --- runners/ubuntu/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/runners/ubuntu/Dockerfile b/runners/ubuntu/Dockerfile index a351382c..b556d4f7 100644 --- a/runners/ubuntu/Dockerfile +++ b/runners/ubuntu/Dockerfile @@ -26,7 +26,5 @@ 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 -v +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"