diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f17569a..6b529a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,10 +24,6 @@ jobs: matrix: include: #VERSIONS - - name: bullseye - variant: bullseye - - name: slim-bullseye - variant: bullseye/slim - name: bookworm variant: bookworm - name: slim-bookworm diff --git a/.github/workflows/mirror_stable.yml b/.github/workflows/mirror_stable.yml index bacc55f..ae00e91 100644 --- a/.github/workflows/mirror_stable.yml +++ b/.github/workflows/mirror_stable.yml @@ -47,18 +47,6 @@ jobs: 1.98-alpine 1.98.1-alpine alpine - - name: bullseye - tags: | - 1-bullseye - 1.98-bullseye - 1.98.1-bullseye - bullseye - - name: slim-bullseye - tags: | - 1-slim-bullseye - 1.98-slim-bullseye - 1.98.1-slim-bullseye - slim-bullseye - name: bookworm tags: | 1-bookworm diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6016f7d..77c2f2b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,16 +22,6 @@ jobs: matrix: include: #VERSIONS - - name: bullseye - context: nightly/bullseye - platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386 - tags: | - nightly-bullseye - - name: slim-bullseye - context: nightly/bullseye/slim - platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386 - tags: | - nightly-bullseye-slim - name: bookworm context: nightly/bookworm platforms: linux/amd64,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le diff --git a/nightly/bullseye/Dockerfile b/nightly/bullseye/Dockerfile deleted file mode 100644 index e7cdc2f..0000000 --- a/nightly/bullseye/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM buildpack-deps:bullseye - -LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust - -ARG RUST_VERSION=nightly -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=${RUST_VERSION} - -RUN set -eux; \ - \ - arch="$(dpkg --print-architecture)"; \ - case "$arch" in \ - 'amd64') \ - rustArch='x86_64-unknown-linux-gnu'; \ - rustupSha256='4acc9acc76d5079515b46346a485974457b5a79893cfb01112423c89aeb5aa10'; \ - ;; \ - 'armhf') \ - rustArch='armv7-unknown-linux-gnueabihf'; \ - rustupSha256='124e02253af9128f9e27ea1ac929cbb73cf44cf35469d0f594a1b62f7b71fea1'; \ - ;; \ - 'arm64') \ - rustArch='aarch64-unknown-linux-gnu'; \ - rustupSha256='9732d6c5e2a098d3521fca8145d826ae0aaa067ef2385ead08e6feac88fa5792'; \ - ;; \ - 'i386') \ - rustArch='i686-unknown-linux-gnu'; \ - rustupSha256='5140e82096f96d1d8077f00eb312648e0e5106d101c9918d086f72cbc69bb3a1'; \ - ;; \ - *) \ - echo >&2 "unsupported architecture: $arch"; \ - exit 1; \ - ;; \ - esac; \ - \ - url="https://static.rust-lang.org/rustup/archive/1.29.0/${rustArch}/rustup-init"; \ - wget --progress=dot:giga "$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/nightly/bullseye/slim/Dockerfile b/nightly/bullseye/slim/Dockerfile deleted file mode 100644 index 4e8879a..0000000 --- a/nightly/bullseye/slim/Dockerfile +++ /dev/null @@ -1,61 +0,0 @@ -FROM debian:bullseye-slim - -LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust - -ARG RUST_VERSION=nightly -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=${RUST_VERSION} - -RUN set -eux; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - gcc \ - libc6-dev \ - wget \ - ; \ - \ - arch="$(dpkg --print-architecture)"; \ - case "$arch" in \ - 'amd64') \ - rustArch='x86_64-unknown-linux-gnu'; \ - rustupSha256='4acc9acc76d5079515b46346a485974457b5a79893cfb01112423c89aeb5aa10'; \ - ;; \ - 'armhf') \ - rustArch='armv7-unknown-linux-gnueabihf'; \ - rustupSha256='124e02253af9128f9e27ea1ac929cbb73cf44cf35469d0f594a1b62f7b71fea1'; \ - ;; \ - 'arm64') \ - rustArch='aarch64-unknown-linux-gnu'; \ - rustupSha256='9732d6c5e2a098d3521fca8145d826ae0aaa067ef2385ead08e6feac88fa5792'; \ - ;; \ - 'i386') \ - rustArch='i686-unknown-linux-gnu'; \ - rustupSha256='5140e82096f96d1d8077f00eb312648e0e5106d101c9918d086f72cbc69bb3a1'; \ - ;; \ - *) \ - echo >&2 "unsupported architecture: $arch"; \ - exit 1; \ - ;; \ - esac; \ - \ - url="https://static.rust-lang.org/rustup/archive/1.29.0/${rustArch}/rustup-init"; \ - wget --progress=dot:giga "$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; \ - \ - apt-get remove -y --auto-remove \ - wget \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustup --version; \ - cargo --version; \ - rustc --version; diff --git a/stable/bullseye/Dockerfile b/stable/bullseye/Dockerfile deleted file mode 100644 index bd503a1..0000000 --- a/stable/bullseye/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM buildpack-deps:bullseye - -LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust - -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.98.1 - -RUN set -eux; \ - \ - arch="$(dpkg --print-architecture)"; \ - case "$arch" in \ - 'amd64') \ - rustArch='x86_64-unknown-linux-gnu'; \ - rustupSha256='4acc9acc76d5079515b46346a485974457b5a79893cfb01112423c89aeb5aa10'; \ - ;; \ - 'armhf') \ - rustArch='armv7-unknown-linux-gnueabihf'; \ - rustupSha256='124e02253af9128f9e27ea1ac929cbb73cf44cf35469d0f594a1b62f7b71fea1'; \ - ;; \ - 'arm64') \ - rustArch='aarch64-unknown-linux-gnu'; \ - rustupSha256='9732d6c5e2a098d3521fca8145d826ae0aaa067ef2385ead08e6feac88fa5792'; \ - ;; \ - 'i386') \ - rustArch='i686-unknown-linux-gnu'; \ - rustupSha256='5140e82096f96d1d8077f00eb312648e0e5106d101c9918d086f72cbc69bb3a1'; \ - ;; \ - *) \ - echo >&2 "unsupported architecture: $arch"; \ - exit 1; \ - ;; \ - esac; \ - \ - url="https://static.rust-lang.org/rustup/archive/1.29.0/${rustArch}/rustup-init"; \ - wget --progress=dot:giga "$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/bullseye/slim/Dockerfile b/stable/bullseye/slim/Dockerfile deleted file mode 100644 index 7507d5c..0000000 --- a/stable/bullseye/slim/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -FROM debian:bullseye-slim - -LABEL org.opencontainers.image.source=https://github.com/rust-lang/docker-rust - -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.98.1 - -RUN set -eux; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - gcc \ - libc6-dev \ - wget \ - ; \ - \ - arch="$(dpkg --print-architecture)"; \ - case "$arch" in \ - 'amd64') \ - rustArch='x86_64-unknown-linux-gnu'; \ - rustupSha256='4acc9acc76d5079515b46346a485974457b5a79893cfb01112423c89aeb5aa10'; \ - ;; \ - 'armhf') \ - rustArch='armv7-unknown-linux-gnueabihf'; \ - rustupSha256='124e02253af9128f9e27ea1ac929cbb73cf44cf35469d0f594a1b62f7b71fea1'; \ - ;; \ - 'arm64') \ - rustArch='aarch64-unknown-linux-gnu'; \ - rustupSha256='9732d6c5e2a098d3521fca8145d826ae0aaa067ef2385ead08e6feac88fa5792'; \ - ;; \ - 'i386') \ - rustArch='i686-unknown-linux-gnu'; \ - rustupSha256='5140e82096f96d1d8077f00eb312648e0e5106d101c9918d086f72cbc69bb3a1'; \ - ;; \ - *) \ - echo >&2 "unsupported architecture: $arch"; \ - exit 1; \ - ;; \ - esac; \ - \ - url="https://static.rust-lang.org/rustup/archive/1.29.0/${rustArch}/rustup-init"; \ - wget --progress=dot:giga "$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; \ - \ - apt-get remove -y --auto-remove \ - wget \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rustup --version; \ - cargo --version; \ - rustc --version; diff --git a/x.py b/x.py index 4202882..ba4011e 100755 --- a/x.py +++ b/x.py @@ -51,7 +51,6 @@ def arches(self) -> list[DebianArch]: return [debian_arches[name] for name in self.arch_names] debian_releases = [ - DebianRelease("bullseye", ["amd64", "arm32v7", "arm64v8", "i386"]), DebianRelease("bookworm", ["amd64", "arm32v7", "arm64v8", "i386", "ppc64le"]), DebianRelease("trixie", ["amd64", "arm32v7", "arm64v8", "i386", "ppc64le", "s390x", "riscv64"], is_latest=True), ]