diff --git a/README.md b/README.md index 9a3cfb5..8b64753 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Then visit https://localhost (accept the SSL warning) to complete setup. ## Features -- **Multiple PHP Versions:** 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5, 8.6 (8.6: cac and cac-fpm only; no geoip extension) (set with `PHPVER` or `-a` flag) +- **Multiple PHP Versions:** 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5, 8.6 (8.6: cac and cac-fpm only) (set with `PHPVER` or `-a` flag) - **Pre-built Images:** Pull the image for your desired PHP version directly from the registry. No need to build locally unless customizing. - **Optimized Build:** Smaller, faster, and more secure images thanks to the improved Dockerfile and `.dockerignore`. - **Automatic Database Setup:** MariaDB is started in DEV mode, credentials are auto-generated and stored in `/home/$user/mysql_creds`. diff --git a/scripts/install-php86.sh b/scripts/install-php86.sh index 0e20ea6..6c52660 100755 --- a/scripts/install-php86.sh +++ b/scripts/install-php86.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash -# PHP 8.6 (Remi EL10 modular php:remi-8.6). Same package set as install-php85.sh -# MINUS php-pecl-geoip: Remi has no 8.6 build of it (and PECL GeoIP is dead -# upstream). Fails loudly (set -e) instead of the older scripts' "exit 0". +# PHP 8.6 (Remi EL10 modular php:remi-8.6). Same package set as install-php85.sh. +# php-pecl-geoip is provided on 8.6 by Remi's maintained fork php-rlerdorf-geoip. +# Fails loudly (set -e) instead of the older scripts' "exit 0". set -euo pipefail dnf module enable php:remi-8.6 -y dnf install -y php php-fpm php-mysqlnd php-xml php-pecl-zip php-sodium php-soap php-pecl-xmlrpc \ -php-pecl-redis5 php-pecl-memcached php-pecl-memcache php-pecl-ip2location php-pecl-imagick \ +php-pecl-redis5 php-pecl-memcached php-pecl-memcache php-pecl-ip2location php-pecl-imagick php-pecl-geoip \ php-mysqlnd php-mbstring php-intl php-gd php-pgsql libzip php-cli # A silently missing extension must fail the build, not ship. loaded=$(php -m) -for ext in mysqlnd gd intl soap sodium zip mbstring xml pgsql redis memcached memcache imagick ip2location xmlrpc; do - printf '%s\n' "$loaded" | grep -qix "$ext" || { echo "FATAL: PHP 8.6 extension '$ext' not loaded" >&2; exit 1; } +for ext in mysqlnd gd intl soap sodium zip mbstring xml pgsql redis memcached memcache imagick ip2location xmlrpc geoip; do + grep -qix "$ext" <<<"$loaded" || { echo "FATAL: PHP 8.6 extension '$ext' not loaded" >&2; exit 1; } done exit 0