Mise à jour des versions PHP dans les Dockerfiles pour passer à la version 8.5 et ajustement des images de base en conséquence.

Author: arnaud-ritti

scripts/conf/php-versions-base-config.yml

@@ -31,7 +31,7 @@ php_versions:
           - name: bookworm
           - name: trixie
         patch_versions:
-          # - 8.1.28 # Pull latest from Official PHP source
+        # - 8.1.28 # Pull latest from Official PHP source
       - minor: "8.2"
         base_os:
           - name: alpine3.21
@@ -56,16 +56,14 @@ php_versions:
           - name: trixie
         patch_versions:
         #   - 8.4.1 # Pull latest from Official PHP source
-      # PHP 8.5-rc has a blocking bug in a dependency that is not yet fixed.
-      # 
-      # - minor: "8.5-rc"
-      #   base_os:
-      #     - name: alpine3.21
-      #     - name: alpine3.22
-      #     - name: bookworm
-      #     - name: trixie
-      #   patch_versions:
-      #     - 8.5-rc
+      - minor: "8.5"
+        base_os:
+          - name: alpine3.21
+          - name: alpine3.22
+          - name: bookworm
+          - name: trixie
+        patch_versions:
+        #   - 8.5.0 # Pull latest from Official PHP source
 
 operating_systems:
   - family: alpine

src/variations/cli/Dockerfile

@@ -1,9 +1,10 @@
 ARG BASE_OS_VERSION='bookworm'
-ARG PHP_VERSION='8.4'
+ARG PHP_VERSION='8.5'
 ARG PHP_VARIATION='cli'
 ARG BASE_REPO='serversideup/php'
 ARG TAG_PREFIX=''
-ARG BASE_IMAGE="${BASE_REPO}:${TAG_PREFIX}${PHP_VERSION}-${PHP_VARIATION}-${BASE_OS_VERSION}-v4.0.0-beta3"
+ARG IMAGE_VERSION='v4.1.0'
+ARG BASE_IMAGE="${BASE_REPO}:${TAG_PREFIX}${PHP_VERSION}-${PHP_VARIATION}-${BASE_OS_VERSION}-${IMAGE_VERSION}"
 
 ##########
 # CLI: Main Image

src/variations/frankenphp/Dockerfile

@@ -1,10 +1,11 @@
 # check=skip=SecretsUsedInArgOrEnv
 ARG BASE_OS_VERSION='trixie'
-ARG PHP_VERSION='8.4'
+ARG PHP_VERSION='8.5'
 ARG PHP_VARIATION='frankenphp'
 ARG BASE_REPO='serversideup/php'
 ARG TAG_PREFIX=''
-ARG BASE_IMAGE="${BASE_REPO}:${TAG_PREFIX}${PHP_VERSION}-${PHP_VARIATION}-${BASE_OS_VERSION}-v4.0.0-beta3"
+ARG IMAGE_VERSION='v4.1.0'
+ARG BASE_IMAGE="${BASE_REPO}:${TAG_PREFIX}${PHP_VERSION}-${PHP_VARIATION}-${BASE_OS_VERSION}-${IMAGE_VERSION}"
 
 ########################
 # Common

src/variations/sail/Dockerfile

@@ -1,9 +1,10 @@
 # check=skip=SecretsUsedInArgOrEnv
 ARG BASE_OS_VERSION='trixie'
-ARG PHP_VERSION='8.4'
+ARG PHP_VERSION='8.5'
 ARG BASE_REPO='ghcr.io/yieldstudio/php'
 ARG TAG_PREFIX=''
-ARG BASE_IMAGE="${BASE_REPO}:${TAG_PREFIX}${PHP_VERSION}-frankenphp-${BASE_OS_VERSION}"
+ARG IMAGE_VERSION='v4.1.0'
+ARG BASE_IMAGE="${BASE_REPO}:${TAG_PREFIX}${PHP_VERSION}-frankenphp-${BASE_OS_VERSION}-${IMAGE_VERSION}"
 
 ########################
 # Common