Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(rust): Remove unsupported bullseye architectures #17677

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Muscraft
Copy link
Contributor

@Muscraft Muscraft commented Oct 5, 2024

This PR contains two changes from docker-rust:

  1. fix: Remove non-LTS arches from bullseye
    • This removes ppc64el and s390x from Rust images based on Debian Bullseye as Debian Bullseye no longer supports those arches since it entered LTS
  2. refactor: Don't change folder on version bump
    • On each release of Rust we would move the files to a new folder, which was unnecessary, so it was changed to always be in stable

Note: The commit message only references 1 as 2 is mostly an internal change

@Muscraft Muscraft requested a review from a team as a code owner October 5, 2024 21:48
Copy link

github-actions bot commented Oct 5, 2024

Diff for 5fbf142:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6d2575e..61d7936 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,30 +3,30 @@ GitRepo: https://github.com/rust-lang/docker-rust.git
 
 Tags: 1-alpine3.19, 1.81-alpine3.19, 1.81.0-alpine3.19, alpine3.19
 Architectures: amd64, arm64v8
-GitCommit: a1d3d373229185bf5d1ae5d31db0581e2d351182
-Directory: 1.81.0/alpine3.19
+GitCommit: 63f877a36f8ba9d9b4b35cd49df3327264510886
+Directory: stable/alpine3.19
 
 Tags: 1-alpine3.20, 1.81-alpine3.20, 1.81.0-alpine3.20, alpine3.20, 1-alpine, 1.81-alpine, 1.81.0-alpine, alpine
 Architectures: amd64, arm64v8
-GitCommit: a1d3d373229185bf5d1ae5d31db0581e2d351182
-Directory: 1.81.0/alpine3.20
+GitCommit: 63f877a36f8ba9d9b4b35cd49df3327264510886
+Directory: stable/alpine3.20
 
 Tags: 1-bookworm, 1.81-bookworm, 1.81.0-bookworm, bookworm, 1, 1.81, 1.81.0, latest
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a1d3d373229185bf5d1ae5d31db0581e2d351182
-Directory: 1.81.0/bookworm
+GitCommit: 63f877a36f8ba9d9b4b35cd49df3327264510886
+Directory: stable/bookworm
 
 Tags: 1-bullseye, 1.81-bullseye, 1.81.0-bullseye, bullseye
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a1d3d373229185bf5d1ae5d31db0581e2d351182
-Directory: 1.81.0/bullseye
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 63f877a36f8ba9d9b4b35cd49df3327264510886
+Directory: stable/bullseye
 
 Tags: 1-slim-bookworm, 1.81-slim-bookworm, 1.81.0-slim-bookworm, slim-bookworm, 1-slim, 1.81-slim, 1.81.0-slim, slim
 Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a1d3d373229185bf5d1ae5d31db0581e2d351182
-Directory: 1.81.0/bookworm/slim
+GitCommit: 63f877a36f8ba9d9b4b35cd49df3327264510886
+Directory: stable/bookworm/slim
 
 Tags: 1-slim-bullseye, 1.81-slim-bullseye, 1.81.0-slim-bullseye, slim-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a1d3d373229185bf5d1ae5d31db0581e2d351182
-Directory: 1.81.0/bullseye/slim
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 63f877a36f8ba9d9b4b35cd49df3327264510886
+Directory: stable/bullseye/slim
diff --git a/rust_bullseye/Dockerfile b/rust_bullseye/Dockerfile
index e89b0e7..2115fcc 100644
--- a/rust_bullseye/Dockerfile
+++ b/rust_bullseye/Dockerfile
@@ -14,8 +14,6 @@ RUN set -eux; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='079430f58ad4da1d1f4f5f2f0bd321422373213246a93b3ddb53dad627f5aa38' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='e7f89da453c8ce5771c28279d1a01d5e83541d420695c74ec81a7ec5d287c51c' ;; \
         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init"; \
diff --git a/rust_slim-bullseye/Dockerfile b/rust_slim-bullseye/Dockerfile
index dd5917a..8f3f708 100644
--- a/rust_slim-bullseye/Dockerfile
+++ b/rust_slim-bullseye/Dockerfile
@@ -21,8 +21,6 @@ RUN set -eux; \
         armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='3c4114923305f1cd3b96ce3454e9e549ad4aa7c07c03aec73d1a785e98388bed' ;; \
         arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2' ;; \
         i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0a6bed6e9f21192a51f83977716466895706059afb880500ff1d0e751ada5237' ;; \
-        ppc64el) rustArch='powerpc64le-unknown-linux-gnu'; rustupSha256='079430f58ad4da1d1f4f5f2f0bd321422373213246a93b3ddb53dad627f5aa38' ;; \
-        s390x) rustArch='s390x-unknown-linux-gnu'; rustupSha256='e7f89da453c8ce5771c28279d1a01d5e83541d420695c74ec81a7ec5d287c51c' ;; \
         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
     esac; \
     url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init"; \

Relevant Maintainers:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant