From 7ab3b0c0468f3608d16f40bd8c615a4ee8c4cdbf Mon Sep 17 00:00:00 2001 From: Scott Schafer Date: Fri, 3 Apr 2026 19:59:30 -0600 Subject: [PATCH] chore: Drop support for Alpine 3.20 --- .github/workflows/ci.yml | 2 -- .github/workflows/mirror_stable.yml | 6 ---- .github/workflows/nightly.yml | 5 --- nightly/alpine3.20/Dockerfile | 48 ----------------------------- stable/alpine3.20/Dockerfile | 48 ----------------------------- x.py | 1 - 6 files changed, 110 deletions(-) delete mode 100644 nightly/alpine3.20/Dockerfile delete mode 100644 stable/alpine3.20/Dockerfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f0fdb6..c1f28fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,8 +36,6 @@ jobs: variant: trixie - name: slim-trixie variant: trixie/slim - - name: alpine3.20 - variant: alpine3.20 - name: alpine3.21 variant: alpine3.21 - name: alpine3.22 diff --git a/.github/workflows/mirror_stable.yml b/.github/workflows/mirror_stable.yml index 7ef9ccd..b284fce 100644 --- a/.github/workflows/mirror_stable.yml +++ b/.github/workflows/mirror_stable.yml @@ -19,12 +19,6 @@ jobs: matrix: include: #VERSIONS - - name: alpine3.20 - tags: | - 1-alpine3.20 - 1.94-alpine3.20 - 1.94.1-alpine3.20 - alpine3.20 - name: alpine3.21 tags: | 1-alpine3.21 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8201e19..1280243 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -53,11 +53,6 @@ jobs: tags: | nightly-trixie-slim nightly-slim - - name: alpine3.20 - context: nightly/alpine3.20 - platforms: linux/amd64,linux/arm64,linux/ppc64le - tags: | - nightly-alpine3.20 - name: alpine3.21 context: nightly/alpine3.21 platforms: linux/amd64,linux/arm64,linux/ppc64le diff --git a/nightly/alpine3.20/Dockerfile b/nightly/alpine3.20/Dockerfile deleted file mode 100644 index 39edca3..0000000 --- a/nightly/alpine3.20/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM alpine:3.20 - -LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust - -RUN apk add --no-cache \ - ca-certificates \ - musl-dev \ - gcc - -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=nightly - -RUN set -eux; \ - \ - arch="$(apk --print-arch)"; \ - case "$arch" in \ - 'x86_64') \ - rustArch='x86_64-unknown-linux-musl'; \ - rustupSha256='9cd3fda5fd293890e36ab271af6a786ee22084b5f6c2b83fd8323cec6f0992c1'; \ - ;; \ - 'aarch64') \ - rustArch='aarch64-unknown-linux-musl'; \ - rustupSha256='88761caacddb92cd79b0b1f939f3990ba1997d701a38b3e8dd6746a562f2a759'; \ - ;; \ - 'ppc64le') \ - rustArch='powerpc64le-unknown-linux-musl'; \ - rustupSha256='e15d033af90b7a55d170aac2d82cc28ddd96dbfcdda7c6d4eb8cb064a99c4646'; \ - ;; \ - *) \ - echo >&2 "unsupported architecture: $arch"; \ - exit 1; \ - ;; \ - esac; \ - \ - url="https://static.rust-lang.org/rustup/archive/1.29.0/${rustArch}/rustup-init"; \ - wget "$url"; \ - echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ - \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ - \ - rustup --version; \ - cargo --version; \ - rustc --version; diff --git a/stable/alpine3.20/Dockerfile b/stable/alpine3.20/Dockerfile deleted file mode 100644 index ad8fcb9..0000000 --- a/stable/alpine3.20/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM alpine:3.20 - -LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust - -RUN apk add --no-cache \ - ca-certificates \ - musl-dev \ - gcc - -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.94.1 - -RUN set -eux; \ - \ - arch="$(apk --print-arch)"; \ - case "$arch" in \ - 'x86_64') \ - rustArch='x86_64-unknown-linux-musl'; \ - rustupSha256='9cd3fda5fd293890e36ab271af6a786ee22084b5f6c2b83fd8323cec6f0992c1'; \ - ;; \ - 'aarch64') \ - rustArch='aarch64-unknown-linux-musl'; \ - rustupSha256='88761caacddb92cd79b0b1f939f3990ba1997d701a38b3e8dd6746a562f2a759'; \ - ;; \ - 'ppc64le') \ - rustArch='powerpc64le-unknown-linux-musl'; \ - rustupSha256='e15d033af90b7a55d170aac2d82cc28ddd96dbfcdda7c6d4eb8cb064a99c4646'; \ - ;; \ - *) \ - echo >&2 "unsupported architecture: $arch"; \ - exit 1; \ - ;; \ - esac; \ - \ - url="https://static.rust-lang.org/rustup/archive/1.29.0/${rustArch}/rustup-init"; \ - wget "$url"; \ - echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ - \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch}; \ - rm rustup-init; \ - chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ - \ - rustup --version; \ - cargo --version; \ - rustc --version; diff --git a/x.py b/x.py index a0f3116..f19c190 100755 --- a/x.py +++ b/x.py @@ -66,7 +66,6 @@ def write_versions(rust_version, rustup_version): latest_alpine_version = "3.23" alpine_versions = [ - "3.20", "3.21", "3.22", latest_alpine_version,