Skip to content

Conversation

@yosifkit
Copy link
Member

@yosifkit yosifkit commented Dec 19, 2025

Racing the automation again. 🏃 Automation failed anyway because a patch failed to apply. 😅

@yosifkit yosifkit force-pushed the bumps branch 2 times, most recently from fa91432 to 67c742d Compare December 19, 2025 20:44
@yosifkit
Copy link
Member Author

Failure without patch changes:

+ filterdiff -x '*/NEWS' 14834.patch
+ patch -p1
patching file ext/xml/compat.c
Hunk #1 FAILED at 375.
1 out of 1 hunk FAILED -- saving rejects to file ext/xml/compat.c.rej

I tried just removing the patch for php/php-src#14834, but then we get this error:

$ docker build 8.1/alpine3.22/cli/
...
+ pecl update-channels
/bin/sh: pecl: not found

The backported patch of php/php-src#19131 for 8.1 (php/php-src@a5df266) breaks our ability to apply the fix for 14834 since it changes adjacent lines, so we revert that commit so that 14834 applies cleanly. We could then apply the real diff of 19131 (instead of the backport patch), but I'm not sure it matters, since it was made for FreeBSD builds.

apply reverse patch of 19131 so that patch 14834 still applies
Copy link

@neersighted neersighted left a comment

Choose a reason for hiding this comment

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

I was asked to give this a second set of eyes since @tianon is indisposed; LGTM!

@yosifkit yosifkit merged commit 5c037ab into docker-library:master Dec 19, 2025
72 checks passed
@yosifkit yosifkit deleted the bumps branch December 19, 2025 21:36
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Dec 19, 2025
yosifkit added a commit to docker-library/official-images that referenced this pull request Dec 19, 2025
Changes:

- docker-library/php@5c037aba: Update 8.1 to 8.1.34 (docker-library/php#1638)

Co-authored-by: Docker Library Bot <doi+docker-library-bot@docker.com>
@tianon
Copy link
Member

tianon commented Dec 20, 2025

8.1 is EOL on 31 Dec 2025 😄

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.

3 participants