fix(php-apps): align package names with Ubuntu 26.04 base#2292
fix(php-apps): align package names with Ubuntu 26.04 base#2292Crow-Control merged 2 commits intomainfrom
Conversation
Ubuntu 26.04 (Resolute) base ships PHP 8.5 only (no 8.3/8.4) and folds opcache, tokenizer, exif, dom, ftp into core; replaces libicu74 → libicu78 and libxml2 → libxml2-16. Update apt-get install lines and PHP config paths accordingly so builds succeed on the new base. Apps fixed: bookstack, cops, dokuwiki, freshrss, grav, heimdall, kimai, lychee, phpmyadmin, piwigo, projectsend, rdesktop, snipe-it, webgrabplus, xbackbone. oscam left for separate fix: omnikey PCSC tarball at ci-tests.linuxserver.io now returns 403; unrelated to base bump. Refs #2275 Agent-Logs-Url: https://github.com/trueforge-org/containerforge/sessions/77424403-3a34-4400-b570-a48dbc30af53 Co-authored-by: Crow-Control <7613738+Crow-Control@users.noreply.github.com>
There was a problem hiding this comment.
Pull request overview
Updates affected PHP-based app images to build cleanly on the Ubuntu 26.04 base by aligning apt package names and PHP version-specific paths with what’s available on 26.04 (Resolute).
Changes:
- Bump PHP extension packages from
php8.3-*/php8.4-*tophp8.5-*across multiple app Dockerfiles. - Update versioned filesystem paths used for php-fpm/php-cli configuration (e.g.,
/etc/php/8.5/...,/etc/php85/...) where applicable. - Rename a couple of system libraries to their 26.04 package names (e.g.,
libicu78,libxml2-16).
Reviewed changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| apps/bookstack/Dockerfile | Switch BookStack’s PHP dependencies and fpm config pathing to PHP 8.5. |
| apps/cops/Dockerfile | Remove PPA usage and install PHP 8.5 packages (but leaves a config-path bug to fix). |
| apps/dokuwiki/Dockerfile | Update DokuWiki PHP dependency package names to PHP 8.5. |
| apps/freshrss/Dockerfile | Update FreshRSS PHP package list to PHP 8.5 equivalents. |
| apps/grav/Dockerfile | Update Grav PHP 8.3 packages and /etc/php83 paths to PHP 8.5 equivalents. |
| apps/heimdall/Dockerfile | Update Heimdall to PHP 8.5 packages and adjust php-fpm/opcache config paths. |
| apps/kimai/Dockerfile | Update Kimai runtime PHP packages and php-fpm env-pass config path to 8.5. |
| apps/lychee/Dockerfile | Drop ondrej/php PPA flow; install PHP 8.5 from Ubuntu repos and update php/composer usage. |
| apps/phpmyadmin/Dockerfile | Update phpMyAdmin PHP 8.3 package names and config directories to 8.5. |
| apps/piwigo/Dockerfile | Update Piwigo PHP package names and php-fpm config paths to PHP 8.5. |
| apps/projectsend/Dockerfile | Update ProjectSend PHP packages to 8.5 (but introduces duplicate package entries). |
| apps/rdesktop/Dockerfile | Update libxml2 dependency to 26.04’s renamed libxml2-16. |
| apps/snipe-it/Dockerfile | Update Snipe-IT PHP packages to 8.5 and adjust php-fpm config pathing accordingly. |
| apps/webgrabplus/Dockerfile | Update ICU library dependency to 26.04’s libicu78. |
| apps/xbackbone/Dockerfile | Update XBackBone runtime PHP package names to PHP 8.5. |
| php8.5-zip \ | ||
| php8.5-sqlite3 && \ | ||
| echo "**** configure php-fpm to pass env vars ****" && \ | ||
| if [ -f /etc/php/8.4/fpm/pool.d/www.conf ]; then sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php/8.4/fpm/pool.d/www.conf && if ! grep -qxF 'clear_env = no' /etc/php/8.4/fpm/pool.d/www.conf; then echo 'clear_env = no' >> /etc/php/8.4/fpm/pool.d/www.conf; fi && echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php/8.4/fpm/php-fpm.conf; fi && \ |
| php8.5-gd \ | ||
| php8.5-mysql \ | ||
| php8.5-gmp \ | ||
| php8.5-mysql \ |
| php8.5-soap \ | ||
| php8.5-xml && \ |
📦 App Size AnalysisNote Comparing 📈 Size Comparison Table
|
📦 App Size AnalysisNote Comparing 📈 Size Comparison Table
|
📦 App Size AnalysisNote Comparing 📈 Size Comparison Table
|
📦 App Size AnalysisNote Comparing 📈 Size Comparison Table
|
📦 App Size AnalysisNote Comparing 📈 Size Comparison Table
|
📦 App Size AnalysisNote Comparing 📈 Size Comparison Table
|
📦 App Size AnalysisNote Comparing 📈 Size Comparison Table
|
📦 App Size AnalysisNote Comparing 📈 Size Comparison Table
|
📦 App Size AnalysisNote Comparing 📈 Size Comparison Table
|
|
Release Autofix Bot seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
The 24.04 → 26.04 base bump (#2271) broke 16 apps in CI run 25463648520. Resolute ships only PHP 8.5 (no 8.3/8.4), folds several extensions into core, and renames a couple of system libs.
Package map applied
php8.3-*/php8.4-*→php8.5-*(and/etc/php/8.x/paths)php8.5-cli/php8.5-common/php8.5-xml):opcache,tokenizer,exif,ftp,domlibicu74→libicu78(webgrabplus)libxml2→libxml2-16(rdesktop, snipe-it)ppa:ondrej/php+software-properties-commonfromcopsandlychee— no longer needed and the PPA has no Resolute releaseApps touched
bookstack, cops, dokuwiki, freshrss, grav, heimdall, kimai, lychee, phpmyadmin, piwigo, projectsend, rdesktop, snipe-it, webgrabplus, xbackbone.
Not addressed
oscam— failure is unrelated to the base bump. The omnikey PCSC driver tarball athttps://ci-tests.linuxserver.io/artifacts/ifdokccid_linux_amd64-v4.2.8.tar.gzreturns HTTP 403, and the upstream HID Global URL is Cloudflare-blocked. Needs an alternate mirror in a follow-up.Example diff
Validated with
docker buildx bake --printon representative apps (bookstack, lychee, rdesktop).