Skip to content

Add support for s390x via "apt-get source --compile" #193

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 2 commits into from
Sep 6, 2017

Conversation

tianon
Copy link
Contributor

@tianon tianon commented Aug 31, 2017

This takes advantage of the fact that http://nginx.org/packages/ includes the source packages as well, and simply compiles them on non-prebuilt architectures instead, which ensures we have a completely compatible experience with minimal maintenance overhead.

This is based heavily on docker-library/postgres#330, and I've tried to be a little bit over-the-top on comments. 😇

I've personally tested all 4 builds on both amd64 and s390x. 👍

This takes advantage of the fact that http://nginx.org/packages/ includes the source packages as well, and simply compiles them on non-prebuilt architectures instead, which ensures we have a completely compatible experience with minimal maintenance overhead.
@@ -65,6 +65,7 @@ for version in "${versions[@]}"; do
echo
cat <<-EOE
Tags: $(join ', ' "${versionAliases[@]}")
Architectures: amd64, i386, s390x
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've currently hard-coded this minimal Architectures list, but as-is, these updates should technically support several other architectures including arm64v8, arm32v7, and ppc64le. For other official images, we usually use bashbrew to scrape the list of Architectures directly from the parent image to embed in the children for cases like this, but I figured that's something we ought to discuss before I implemented it. 😇 ❤️

I'd also be happy to simply adjust this list to include more arches if you'd rather, but then they'll need to be manually updated for any base image changes or new arches (which may be desirable).

I'm also happy to test on any other arches. 👍

Copy link
Member

Choose a reason for hiding this comment

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

I'm fine with providing images for all the other arches supported - we've seen requests for armv7 and ppc64le at least.

LGTM otherwise.

Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Alright, neato! I'll have this updated shortly!

@tianon
Copy link
Contributor Author

tianon commented Sep 5, 2017

I've successfully built stable/stretch on ppc64le, arm64v8, and arm32v7. Happy to do more build tests, but also happy to PR again afterwards if the official images builds happen to fail for some odd reason.

@thresheek thresheek merged commit 96ea05e into nginx:master Sep 6, 2017
@thresheek
Copy link
Member

Many thanks!

@tianon tianon deleted the s390x branch September 6, 2017 16:26
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.

2 participants