Skip to content

Update PyPy 3.x to Debian Stretch #32

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 3 commits into from
Mar 28, 2019
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Mar 27, 2019

The problematic .so file in PyPy3 (that links to old libssl releases) can be rebuilt pretty trivially at image build time!

(In PyPy2, the old libssl release is linked into /usr/local/bin/pypy itself, so there's nothing we can do there short of rebuilding PyPy itself.)

Closes #24 (as much as we can)

The problematic `.so` file in PyPy3 (that links to old `libssl` releases) can be rebuilt pretty trivially at image build time!

(In PyPy2, the old `libssl` release is linked into `/usr/local/bin/pypy` itself, so there's nothing we can do there short of rebuilding PyPy itself.)
@tianon

This comment has been minimized.

@tianon
Copy link
Member Author

tianon commented Mar 27, 2019

OH SNAP, this approach lets me finally resolve part of the s390x/ppc64le issues I was messing with in https://bitbucket.org/pypy/pypy/issues/2646!

Additional commit coming soon.

Turns out this approach works well for consuming the RedHat-host-built binaries published for these other architectures too!
@tianon
Copy link
Member Author

tianon commented Mar 27, 2019

Updated Diff:
$ diff -u <(bashbrew cat https://github.com/docker-library/official-images/raw/master/library/pypy) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63	2019-03-27 16:13:54.679987810 -0700
+++ /dev/fd/62	2019-03-27 16:13:54.683987699 -0700
@@ -3,30 +3,30 @@
 
 Tags: 2.7-7.1.0, 2.7-7.1, 2.7-7, 2.7, 2-7.1.0, 2-7.1, 2-7, 2, 2.7-7.1.0-jessie, 2.7-7.1-jessie, 2.7-7-jessie, 2.7-jessie, 2-7.1.0-jessie, 2-7.1-jessie, 2-7-jessie, 2-jessie
 Architectures: amd64, i386
-GitCommit: bcfd9f2587ef4aa818bf37eb1a6dffa348ba90cf
+GitCommit: d54416e2be73520a490eb0dd2819d8a2b4df3652
 Directory: 2.7
 
 Tags: 2.7-7.1.0-slim, 2.7-7.1-slim, 2.7-7-slim, 2.7-slim, 2-7.1.0-slim, 2-7.1-slim, 2-7-slim, 2-slim, 2.7-7.1.0-slim-jessie, 2.7-7.1-slim-jessie, 2.7-7-slim-jessie, 2.7-slim-jessie, 2-7.1.0-slim-jessie, 2-7.1-slim-jessie, 2-7-slim-jessie, 2-slim-jessie
 Architectures: amd64, i386
-GitCommit: bcfd9f2587ef4aa818bf37eb1a6dffa348ba90cf
+GitCommit: d54416e2be73520a490eb0dd2819d8a2b4df3652
 Directory: 2.7/slim
 
-Tags: 3.5-7.0.0, 3.5-7.0, 3.5-7, 3.5, 3-7.0.0, 3-7.0, 3-7, 3, latest, 3.5-7.0.0-jessie, 3.5-7.0-jessie, 3.5-7-jessie, 3.5-jessie, 3-7.0.0-jessie, 3-7.0-jessie, 3-7-jessie, 3-jessie, jessie
-Architectures: amd64, i386
-GitCommit: a25dfed4a6f684edfa44947fdb9f198962c5885a
+Tags: 3.5-7.0.0, 3.5-7.0, 3.5-7, 3.5, 3-7.0.0, 3-7.0, 3-7, 3, latest, 3.5-7.0.0-stretch, 3.5-7.0-stretch, 3.5-7-stretch, 3.5-stretch, 3-7.0.0-stretch, 3-7.0-stretch, 3-7-stretch, 3-stretch, stretch
+Architectures: amd64, i386, ppc64le, s390x
+GitCommit: b3ee440a1a459e63001454e5a9e1f20da439edab
 Directory: 3.5
 
-Tags: 3.5-7.0.0-slim, 3.5-7.0-slim, 3.5-7-slim, 3.5-slim, 3-7.0.0-slim, 3-7.0-slim, 3-7-slim, 3-slim, slim, 3.5-7.0.0-slim-jessie, 3.5-7.0-slim-jessie, 3.5-7-slim-jessie, 3.5-slim-jessie, 3-7.0.0-slim-jessie, 3-7.0-slim-jessie, 3-7-slim-jessie, 3-slim-jessie, slim-jessie
-Architectures: amd64, i386
-GitCommit: a25dfed4a6f684edfa44947fdb9f198962c5885a
+Tags: 3.5-7.0.0-slim, 3.5-7.0-slim, 3.5-7-slim, 3.5-slim, 3-7.0.0-slim, 3-7.0-slim, 3-7-slim, 3-slim, slim, 3.5-7.0.0-slim-stretch, 3.5-7.0-slim-stretch, 3.5-7-slim-stretch, 3.5-slim-stretch, 3-7.0.0-slim-stretch, 3-7.0-slim-stretch, 3-7-slim-stretch, 3-slim-stretch, slim-stretch
+Architectures: amd64, i386, ppc64le, s390x
+GitCommit: b3ee440a1a459e63001454e5a9e1f20da439edab
 Directory: 3.5/slim
 
-Tags: 3.6-7.1.0, 3.6-7.1, 3.6-7, 3.6, 3.6-7.1.0-jessie, 3.6-7.1-jessie, 3.6-7-jessie, 3.6-jessie
-Architectures: amd64, i386
-GitCommit: 6ec92626b247be066a0c89d86521a00571cc5d44
+Tags: 3.6-7.1.0, 3.6-7.1, 3.6-7, 3.6, 3.6-7.1.0-stretch, 3.6-7.1-stretch, 3.6-7-stretch, 3.6-stretch
+Architectures: amd64, i386, s390x
+GitCommit: b3ee440a1a459e63001454e5a9e1f20da439edab
 Directory: 3.6
 
-Tags: 3.6-7.1.0-slim, 3.6-7.1-slim, 3.6-7-slim, 3.6-slim, 3.6-7.1.0-slim-jessie, 3.6-7.1-slim-jessie, 3.6-7-slim-jessie, 3.6-slim-jessie
-Architectures: amd64, i386
-GitCommit: 6ec92626b247be066a0c89d86521a00571cc5d44
+Tags: 3.6-7.1.0-slim, 3.6-7.1-slim, 3.6-7-slim, 3.6-slim, 3.6-7.1.0-slim-stretch, 3.6-7.1-slim-stretch, 3.6-7-slim-stretch, 3.6-slim-stretch
+Architectures: amd64, i386, s390x
+GitCommit: b3ee440a1a459e63001454e5a9e1f20da439edab
 Directory: 3.6/slim

@yosifkit
Copy link
Member

Looks like we always need libncurses5;

ImportError: libpanel.so.5: cannot open shared object file: No such file or directory
root@ea808e34928a:/usr/local# ls lib_pypy/*.so | xargs ldd
...
lib_pypy/_curses_cffi.pypy3-70-x86_64-linux-gnu.so:
	linux-vdso.so.1 (0x00007ffe7f9f0000)
	libncursesw.so.5 => /lib/x86_64-linux-gnu/libncursesw.so.5 (0x00007fb130c2e000)
	libtinfo.so.5 => /lib/x86_64-linux-gnu/libtinfo.so.5 (0x00007fb130a04000)
	libpanel.so.5 => not found
...

…ut the requirement is not IBM arches specific)
@yosifkit yosifkit merged commit b659b85 into docker-library:master Mar 28, 2019
@yosifkit yosifkit deleted the stretch branch March 28, 2019 23:36
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Mar 29, 2019
Changes:

- docker-library/pypy@b659b85: Merge pull request docker-library/pypy#32 from infosiftr/stretch
- docker-library/pypy@abb5b51: Adjust "libncurses5"-keeping code to keep things differently (turns out the requirement is not IBM arches specific)
- docker-library/pypy@b3ee440: Add support for s390x and ppc64le where possible
- docker-library/pypy@d54416e: Update PyPy 3.x to Debian Stretch
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