Skip to content

Remove s390x from Alpine variants on 3.14(+) #1015

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

Merged
merged 1 commit into from
Apr 1, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Apr 1, 2025

I've also refactored all our "exclude an architecture in certain combinations" sections to have slightly more context in-file and to be more targeted/focused on a single issue so they're easier to read.

$ diff -u <(bashbrew cat python) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63	2025-04-01 15:12:40.298947543 -0700
+++ /dev/fd/62	2025-04-01 15:12:40.298947543 -0700
@@ -24,12 +24,12 @@
 Directory: 3.14-rc/slim-bullseye

 Tags: 3.14.0a6-alpine3.21, 3.14-rc-alpine3.21, 3.14.0a6-alpine, 3.14-rc-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 GitCommit: 0bd97693f7105bfb6f0ef81020c6d81ade21bc0b
 Directory: 3.14-rc/alpine3.21

 Tags: 3.14.0a6-alpine3.20, 3.14-rc-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 GitCommit: 0bd97693f7105bfb6f0ef81020c6d81ade21bc0b
 Directory: 3.14-rc/alpine3.20

Closes #1014

I've also refactored all our "exclude an architecture in certain combinations" sections to have slightly more context in-file and to be more targeted/focused on a single issue so they're easier to read.

```diff
$ diff -u <(bashbrew cat python) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63	2025-04-01 15:12:40.298947543 -0700
+++ /dev/fd/62	2025-04-01 15:12:40.298947543 -0700
@@ -24,12 +24,12 @@
 Directory: 3.14-rc/slim-bullseye

 Tags: 3.14.0a6-alpine3.21, 3.14-rc-alpine3.21, 3.14.0a6-alpine, 3.14-rc-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 GitCommit: 0bd9769
 Directory: 3.14-rc/alpine3.21

 Tags: 3.14.0a6-alpine3.20, 3.14-rc-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 GitCommit: 0bd9769
 Directory: 3.14-rc/alpine3.20

```
Comment on lines -151 to -154
if [ "$fullVersion" = '3.14.0a1' ]; then
# https://github.com/python/cpython/issues/125535 - 3.14.0a1 fails to build on i386
# https://github.com/python/cpython/pull/125244 (already fixed for the next release)
variantArches="$(sed <<<" $variantArches " -e 's/ i386 / /g')"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also straight up dead code. 😄

@yosifkit yosifkit merged commit dca0bac into docker-library:master Apr 1, 2025
47 checks passed
@yosifkit yosifkit deleted the rm-3.14-s390x-alpine branch April 1, 2025 23:40
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Apr 1, 2025
Changes:

- docker-library/python@dca0bace: Merge pull request docker-library/python#1015 from infosiftr/rm-3.14-s390x-alpine
- docker-library/python@46594edb: Remove s390x from Alpine variants on 3.14(+)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ensurepip failing on s390x 3.14.0a6 Alpine images
2 participants