forked from RoushTech/docker
WIP: Fix ubuntu-php build #7
Loading…
Reference in a new issue
No description provided.
Delete branch "fix/ubuntu-php-build"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
The
ubuntu-phpbake target failed validation on every PHP version. Two root causes:/etc/php/<version>/{cli,fpm}/, but the image installs a flat Alpine-style layout at/etc/php/. Fixed by symlinking Ubuntu's expected paths onto the flat layout — this also replaces the old PHP 7.4-only directory shuffle, so all versions now work the same way.ppa:ondrej/nginxwas dropped in the FrankenPHP commit, and the PPA has since been deleted from Launchpad entirely. nginx now comes from nginx.org's own apt repository (stable, currently 1.30;NGINX_VERSIONbumped accordingly).Also:
conf.dentries whose extension.soisn't shipped on Ubuntu (openssl is built in; msgpack/tidy/gmp etc. aren't installed) to silence startup warnings.php.shvalidation now greps for thePHP x.y.zbanner instead of assuming it's the first line of output, since startup warnings (e.g. the Xdebug+JIT notice while xdebug is loaded at build time) can precede it.ubuntu-phpin the CI build matrix.Verified locally:
docker buildx bake ubuntu-php(all of 7.4/8.2/8.3/8.4/8.5) builds and passes self-validation on linux/arm64. amd64 gets exercised in CI.🤖 Generated with Claude Code
- Wire Ubuntu's /etc/php/<version>/{cli,fpm} config paths to our flat /etc/php layout via symlinks; replaces the PHP 7.4-only directory shuffle and makes extensions actually load on every version. - ppa:ondrej/nginx no longer exists on Launchpad; take nginx stable from nginx.org's repository instead (now 1.30, bump NGINX_VERSION). - Drop conf.d entries whose extension .so isn't present on Ubuntu so PHP doesn't emit startup warnings. - Make php.sh validation find the 'PHP x.y.z' banner line instead of assuming it is the first line of output. - Enable ubuntu-php in the CI build matrix. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>View command line instructions
Manual merge helper
Use this merge commit message when completing the merge manually.
Checkout
From your project repository, check out a new branch and test the changes.Merge
Merge the changes and update on Forgejo.Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.