Update PHP version in build script and adjust opcache handling for PHP 8.5

Author: stephdl

build-images.sh

@@ -13,56 +13,65 @@ reponame="webserver"
 podman build \
     --force-rm \
     --layers \
-    --tag "${repobase}/php8.4-fpm" \
-    --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.4.15-fpm-bookworm" \
+    --tag "${repobase}/php8.5-fpm" \
+    --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.5.1-fpm-bookworm" \
     container
 
-images+=("${repobase}/php8.4-fpm")
-
-podman build \
-    --force-rm \
-    --layers \
-    --tag "${repobase}/php8.3-fpm" \
-    --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.3.28-fpm-bookworm" \
-    container
-
-images+=("${repobase}/php8.3-fpm")
-
-podman build \
-    --force-rm \
-    --layers \
-    --tag "${repobase}/php8.2-fpm" \
-    --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.2.29-fpm-bookworm" \
-    container
-
-images+=("${repobase}/php8.2-fpm")
-
-podman build \
-    --force-rm \
-    --layers \
-    --tag "${repobase}/php8.1-fpm" \
-    --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.1.33-fpm-bookworm" \
-    container
-
-images+=("${repobase}/php8.1-fpm")
-
-podman build \
-    --force-rm \
-    --layers \
-    --tag "${repobase}/php8.0-fpm" \
-    --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.0.30-fpm-bullseye" \
-    container
-
-images+=("${repobase}/php8.0-fpm")
-
-podman build \
-    --force-rm \
-    --layers \
-    --tag "${repobase}/php7.4-fpm" \
-    --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:7.4.33-fpm-bullseye" \
-    container
-
-images+=("${repobase}/php7.4-fpm")
+images+=("${repobase}/php8.5-fpm")
+
+# podman build \
+#     --force-rm \
+#     --layers \
+#     --tag "${repobase}/php8.4-fpm" \
+#     --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.4.15-fpm-bookworm" \
+#     container
+
+# images+=("${repobase}/php8.4-fpm")
+
+# podman build \
+#     --force-rm \
+#     --layers \
+#     --tag "${repobase}/php8.3-fpm" \
+#     --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.3.28-fpm-bookworm" \
+#     container
+
+# images+=("${repobase}/php8.3-fpm")
+
+# podman build \
+#     --force-rm \
+#     --layers \
+#     --tag "${repobase}/php8.2-fpm" \
+#     --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.2.29-fpm-bookworm" \
+#     container
+
+# images+=("${repobase}/php8.2-fpm")
+
+# podman build \
+#     --force-rm \
+#     --layers \
+#     --tag "${repobase}/php8.1-fpm" \
+#     --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.1.33-fpm-bookworm" \
+#     container
+
+# images+=("${repobase}/php8.1-fpm")
+
+# podman build \
+#     --force-rm \
+#     --layers \
+#     --tag "${repobase}/php8.0-fpm" \
+#     --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:8.0.30-fpm-bullseye" \
+#     container
+
+# images+=("${repobase}/php8.0-fpm")
+
+# podman build \
+#     --force-rm \
+#     --layers \
+#     --tag "${repobase}/php7.4-fpm" \
+#     --build-arg "PHP_VERSION_IMAGE=docker.io/library/php:7.4.33-fpm-bullseye" \
+#     container
+
+# images+=("${repobase}/php7.4-fpm")
 
 # Create a new empty container image
 container=$(buildah from scratch)

container/Containerfile

@@ -49,7 +49,6 @@ ARG PHP_EXTENSIONS="\
     intl \
     ldap \
     mysqli \
-    opcache \
     pcntl \
     pdo_mysql \
     pdo_pgsql \
@@ -106,6 +105,11 @@ RUN set -eux \
     \
     && docker-php-ext-install -j"$(nproc)" $PHP_EXTENSIONS \
     \
+    # --- Handle opcache depending on PHP version (skip for 8.5.x) ---
+    &&  if ! echo "$PHP_VERSION_IMAGE" | grep -q "8.5"; then \
+        docker-php-ext-install -j"$(nproc)" opcache; \
+    fi \
+    \
     # --- Handle IMAP depending on PHP version ---
     && if php -r 'exit(version_compare(PHP_VERSION,"8.4.0","<")?0:1);'; then \
         docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \
@@ -153,5 +157,10 @@ RUN set -eux \
     done
 
     # --- Custom PHP configs ---
-    COPY docker-php-ext-opcache.ini /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-    COPY docker-php-ext-imap.ini /usr/local/etc/php/conf.d/docker-php-ext-imap.ini
+    && if ! php -r 'exit(version_compare(PHP_VERSION,"8.5.0",">=")?0:1);'; then \
+        cp /docker-php-ext-opcache.ini /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini; \
+    fi \
+    && cp /docker-php-ext-imap.ini /usr/local/etc/php/conf.d/docker-php-ext-imap.ini
+
+COPY docker-php-ext-opcache.ini /docker-php-ext-opcache.ini
+COPY docker-php-ext-imap.ini /usr/local/etc/php/conf.d/docker-php-ext-imap.ini