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

Add image for musllinux_1_1 #1135

Merged
merged 2 commits into from
Sep 18, 2021
Merged

Add image for musllinux_1_1 #1135

merged 2 commits into from
Sep 18, 2021

Conversation

lkollar
Copy link
Contributor

@lkollar lkollar commented Jul 12, 2021

Closes: #1134

@lkollar lkollar self-assigned this Jul 12, 2021
@lkollar lkollar force-pushed the musl branch 2 times, most recently from abec629 to 61bcb8e Compare July 15, 2021 22:06
@mayeut
Copy link
Member

mayeut commented Jul 18, 2021

Thanks for working on this @lkollar !
It looks promising.

@lkollar lkollar marked this pull request as ready for review July 19, 2021 20:16
@lkollar lkollar force-pushed the musl branch 3 times, most recently from f628508 to b0897dd Compare July 19, 2021 22:00
@lkollar
Copy link
Contributor Author

lkollar commented Jul 22, 2021

@mayeut this is ready. I've pushed the changes as fixups and new commits to make it easier to review.

@mayeut
Copy link
Member

mayeut commented Jul 24, 2021

@lkollar,

I reworked the way python tools are installed (auditwheel & cmake).
Can you rebase please ?
I can do it if you prefer or don't have time.
Ideally I'd like to see 2 commits overall:

  • 1st commit musllinux addition as if cmake python distribution was available
  • 2nd commit with cmake installation workaround (this will allow to revert that commit easily once cmake is available for musllinux on PyPI)

Thanks

@mayeut
Copy link
Member

mayeut commented Jul 26, 2021

The requirements-*.in files have no reason to change now.
Other than that, we need to go forward with auditwheel before this can be merged.
I published some images based on this PR in order to test auditwheel pypa/auditwheel#315 & cibuildwheel pypa/cibuildwheel#768

@lkollar
Copy link
Contributor Author

lkollar commented Jul 26, 2021

3c39866 adds the workaround for CMake. I've also added a separate commit to skip the auditwheel test on musllinux and make sure that the rest of the tests run fine. I'll try to wrap up the work on auditwheel next.

@mayeut
Copy link
Member

mayeut commented Jul 26, 2021

I added some more suggestions for cases that seems really dependent on musl vs glibc rather than a specific image version.
I did not add the suggestion for the workarounds which will hopefully disappear soon.

@lkollar, can you revert to draft while waiting for an auditwheel update please ?

As I see it, auditwheel will get released before the image. This PR will then be rebased and the workaround on auditwheel dropped.

@lkollar lkollar marked this pull request as draft July 27, 2021 12:31
docker/Dockerfile Outdated Show resolved Hide resolved
@mayeut
Copy link
Member

mayeut commented Sep 18, 2021

There's an unrelated issue with arm64 builds on Travis CI. I will investigate this.

The image is based on Alpine Linux 3.12.
There are no wheels for CMake on musllinux and since it takes a long
time to build it from source, we can instead install it with the OS
package manager until wheels are available.
@mayeut mayeut marked this pull request as ready for review September 18, 2021 20:07
@mayeut mayeut merged commit f12faf3 into pypa:master Sep 18, 2021
@mayeut
Copy link
Member

mayeut commented Sep 18, 2021

We'll need to add some docs but for now, I'm merging this.
Thanks @lkollar, @liath

@alex
Copy link
Member

alex commented Sep 18, 2021

🎉 are there any steps required before the images are uploaded to quay.io?

@mayeut
Copy link
Member

mayeut commented Sep 18, 2021

@alex,

once the CI build is finished on master, images should be available on quay.io
There's already an issue with the i686 image (random network failure). I'll restart the build once everything else is built (I hope I setup quay.io properly otherwise I'll have to redo that).

@alex
Copy link
Member

alex commented Sep 18, 2021 via email

@hugovk
Copy link
Contributor

hugovk commented Sep 20, 2021

Thanks for this!

Should musllinux_1_1 also be documented in the README?

@mayeut
Copy link
Member

mayeut commented Sep 20, 2021

@hugovk, yes, c.f. #1135 (comment)

@@ -28,6 +31,8 @@ if [ "${AUDITWHEEL_POLICY}" == "manylinux2010" ] || [ "${AUDITWHEEL_POLICY}" ==
MANYLINUX_DEPS="glibc-devel libstdc++-devel glib2-devel libX11-devel libXext-devel libXrender-devel mesa-libGL-devel libICE-devel libSM-devel"
elif [ "${AUDITWHEEL_POLICY}" == "manylinux_2_24" ]; then
MANYLINUX_DEPS="libc6-dev libstdc++-6-dev libglib2.0-dev libx11-dev libxext-dev libxrender-dev libgl1-mesa-dev libice-dev libsm-dev"
elif [ "${AUDITWHEEL_POLICY}" == "musllinux_1_1" ]; then
MANYLINUX_DEPS="musl-dev libstdc++ glib-dev libx11-dev libxext-dev libxrender-dev mesa-dev libice-dev libsm-dev"

This comment was marked as resolved.

This comment was marked as resolved.

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.

Create musllinux images
6 participants