Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Dec 17, 2025

This allows us to completely remove the php-fpm.conf hacks by having PHP do the right thing by default instead.

There's a lot of overlap here with #1635, which is not incidental -- reviewing that had me scratching my head and feeling sad at my past self. 😂

So I think that one should probably merge first and then I'll rebase this, but like I said over there, I think this one should wait until the new year too just in case it has some unintended side effect I'm not seeing right now. 🙈

This allows us to completely remove the `php-fpm.conf` hacks by having PHP do the right thing by default instead.
@yosifkit yosifkit merged commit 6485b53 into docker-library:master Jan 9, 2026
100 checks passed
@yosifkit yosifkit deleted the sysconfdir branch January 9, 2026 21:26
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jan 9, 2026
Changes:

- docker-library/php@6485b53a: Set `sysconfdir` explicitly during build (docker-library/php#1636)
- docker-library/php@f26909cd: Move fpm listen for easier config override (docker-library/php#1635)
- docker-library/php@bc5b3fdc: Move `variants` calculation into `jq` (docker-library/php#1640)
- docker-library/php@91d35430: Post 8.1 EOL cleanup (docker-library/php#1642)
tianon pushed a commit to docker-library/official-images that referenced this pull request Jan 9, 2026
Changes:

- docker-library/php@6485b53a: Set `sysconfdir` explicitly during build (docker-library/php#1636)
- docker-library/php@f26909cd: Move fpm listen for easier config override (docker-library/php#1635)
- docker-library/php@bc5b3fdc: Move `variants` calculation into `jq` (docker-library/php#1640)
- docker-library/php@91d35430: Post 8.1 EOL cleanup (docker-library/php#1642)

Co-authored-by: Docker Library Bot <[email protected]>
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