Enhance Dockerfiles to conditionally install opcache for PHP versions below 8.5( PHP 8.5 integrates it directly https://wiki.php.net/rfc/make_opcache_required)

Author: ioaniftimesei

.github/workflows/Dockerfile.centos-php-test

@@ -19,6 +19,9 @@ RUN dnf --assumeyes module reset php
 RUN dnf --assumeyes --nogpgcheck module install php:remi-${PHP_VERSION}
 RUN dnf --assumeyes install php-pdo
 RUN dnf --assumeyes install php-mysqlnd
+RUN if [ "$(printf '%s\n' "${PHP_VERSION}" "8.5" | sort -V | head -n1)" != "8.5" ]; then \
+      dnf --assumeyes install php-opcache || true; \
+    fi
 RUN yum install -y mod_php nginx php-fpm procps-ng mysql-server
 
 

.github/workflows/Dockerfile.ubuntu-php-test

@@ -27,15 +27,16 @@ RUN apt-get update
 
 RUN set -eux; \
     PHP_PKG="php${PHP_VERSION}"; \
-    apt-get install -y --no-install-recommends \
-      nginx \
-      apache2 \
-      mariadb-server \
+    # Build package list - PHP 8.5+ has opcache bundled, so skip the separate opcache package \
+    PACKAGES="nginx apache2 mariadb-server \
       ${PHP_PKG} ${PHP_PKG}-cli ${PHP_PKG}-common ${PHP_PKG}-fpm \
       ${PHP_PKG}-curl ${PHP_PKG}-sqlite3 ${PHP_PKG}-mysql \
-      ${PHP_PKG}-mbstring ${PHP_PKG}-xml ${PHP_PKG}-zip ${PHP_PKG}-opcache \
-      libapache2-mod-php${PHP_VERSION} \
-    ; \
+      ${PHP_PKG}-mbstring ${PHP_PKG}-xml ${PHP_PKG}-zip \
+      libapache2-mod-php${PHP_VERSION}"; \
+    if [ "$(printf '%s\n' "${PHP_VERSION}" "8.5" | sort -V | head -n1)" != "8.5" ]; then \
+      PACKAGES="${PACKAGES} ${PHP_PKG}-opcache"; \
+    fi; \
+    apt-get install -y --no-install-recommends ${PACKAGES} \
     # Apache: switch to prefork for mod_php scenario and enable rewrite
     a2dismod mpm_event || true; \
     a2dismod mpm_worker || true; \