Skip to content

Update php #19414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2025
Merged

Update php #19414

merged 1 commit into from
Jul 7, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 7, 2025

Changes:

Changes:

- docker-library/php@adcc38eb: Merge pull request docker-library/php#1589 from jnoordsij/add-php8.5-rc
- docker-library/php@5edcb5b2: Add PHP 8.5-rc variant
- docker-library/php@6fb46669: Enable OPCache for 8.5 pending upstream changes
- docker-library/php@105bb3e5: Update in preparation for first PHP 8.5 alpha release
- docker-library/php@c071029e: Update API url for obtaining RC releases
- docker-library/php@82bac8f9: Cleanup some (now) unused code/conditions
@tianon tianon requested a review from a team as a code owner July 7, 2025 20:14
Copy link

github-actions bot commented Jul 7, 2025

Diff for 003f18f:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index db9a170..7a0d98d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -280,3 +280,73 @@ Tags: 8.4.10-zts-bullseye, 8.4-zts-bullseye, 8-zts-bullseye, zts-bullseye
 Architectures: amd64, arm32v7, arm64v8, i386
 GitCommit: 6e025fb18826b21b5aa340f9cb35f82d31f58f16
 Directory: 8.4/bullseye/zts
+
+Tags: 8.5.0alpha1-apache-bookworm, 8.5-rc-apache-bookworm, 8.5.0alpha1-apache, 8.5-rc-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/bookworm/apache
+
+Tags: 8.5.0alpha1-apache-bullseye, 8.5-rc-apache-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/bullseye/apache
+
+Tags: 8.5.0alpha1-cli-alpine3.21, 8.5-rc-cli-alpine3.21, 8.5.0alpha1-alpine3.21, 8.5-rc-alpine3.21
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/alpine3.21/cli
+
+Tags: 8.5.0alpha1-cli-alpine3.22, 8.5-rc-cli-alpine3.22, 8.5.0alpha1-alpine3.22, 8.5-rc-alpine3.22, 8.5.0alpha1-cli-alpine, 8.5-rc-cli-alpine, 8.5.0alpha1-alpine, 8.5-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/alpine3.22/cli
+
+Tags: 8.5.0alpha1-cli-bookworm, 8.5-rc-cli-bookworm, 8.5.0alpha1-bookworm, 8.5-rc-bookworm, 8.5.0alpha1-cli, 8.5-rc-cli, 8.5.0alpha1, 8.5-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/bookworm/cli
+
+Tags: 8.5.0alpha1-cli-bullseye, 8.5-rc-cli-bullseye, 8.5.0alpha1-bullseye, 8.5-rc-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/bullseye/cli
+
+Tags: 8.5.0alpha1-fpm-alpine3.21, 8.5-rc-fpm-alpine3.21
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/alpine3.21/fpm
+
+Tags: 8.5.0alpha1-fpm-alpine3.22, 8.5-rc-fpm-alpine3.22, 8.5.0alpha1-fpm-alpine, 8.5-rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/alpine3.22/fpm
+
+Tags: 8.5.0alpha1-fpm-bookworm, 8.5-rc-fpm-bookworm, 8.5.0alpha1-fpm, 8.5-rc-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/bookworm/fpm
+
+Tags: 8.5.0alpha1-fpm-bullseye, 8.5-rc-fpm-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/bullseye/fpm
+
+Tags: 8.5.0alpha1-zts-alpine3.21, 8.5-rc-zts-alpine3.21
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/alpine3.21/zts
+
+Tags: 8.5.0alpha1-zts-alpine3.22, 8.5-rc-zts-alpine3.22, 8.5.0alpha1-zts-alpine, 8.5-rc-zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/alpine3.22/zts
+
+Tags: 8.5.0alpha1-zts-bookworm, 8.5-rc-zts-bookworm, 8.5.0alpha1-zts, 8.5-rc-zts
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/bookworm/zts
+
+Tags: 8.5.0alpha1-zts-bullseye, 8.5-rc-zts-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 5edcb5b2d79196de6d80bc10a0a0518199dbd46d
+Directory: 8.5-rc/bullseye/zts
diff --git a/_bashbrew-list b/_bashbrew-list
index 9b164db..6e0e8e9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -241,6 +241,60 @@ php:8.4.10-zts-alpine3.21
 php:8.4.10-zts-alpine3.22
 php:8.4.10-zts-bookworm
 php:8.4.10-zts-bullseye
+php:8.5-rc
+php:8.5-rc-alpine
+php:8.5-rc-alpine3.21
+php:8.5-rc-alpine3.22
+php:8.5-rc-apache
+php:8.5-rc-apache-bookworm
+php:8.5-rc-apache-bullseye
+php:8.5-rc-bookworm
+php:8.5-rc-bullseye
+php:8.5-rc-cli
+php:8.5-rc-cli-alpine
+php:8.5-rc-cli-alpine3.21
+php:8.5-rc-cli-alpine3.22
+php:8.5-rc-cli-bookworm
+php:8.5-rc-cli-bullseye
+php:8.5-rc-fpm
+php:8.5-rc-fpm-alpine
+php:8.5-rc-fpm-alpine3.21
+php:8.5-rc-fpm-alpine3.22
+php:8.5-rc-fpm-bookworm
+php:8.5-rc-fpm-bullseye
+php:8.5-rc-zts
+php:8.5-rc-zts-alpine
+php:8.5-rc-zts-alpine3.21
+php:8.5-rc-zts-alpine3.22
+php:8.5-rc-zts-bookworm
+php:8.5-rc-zts-bullseye
+php:8.5.0alpha1
+php:8.5.0alpha1-alpine
+php:8.5.0alpha1-alpine3.21
+php:8.5.0alpha1-alpine3.22
+php:8.5.0alpha1-apache
+php:8.5.0alpha1-apache-bookworm
+php:8.5.0alpha1-apache-bullseye
+php:8.5.0alpha1-bookworm
+php:8.5.0alpha1-bullseye
+php:8.5.0alpha1-cli
+php:8.5.0alpha1-cli-alpine
+php:8.5.0alpha1-cli-alpine3.21
+php:8.5.0alpha1-cli-alpine3.22
+php:8.5.0alpha1-cli-bookworm
+php:8.5.0alpha1-cli-bullseye
+php:8.5.0alpha1-fpm
+php:8.5.0alpha1-fpm-alpine
+php:8.5.0alpha1-fpm-alpine3.21
+php:8.5.0alpha1-fpm-alpine3.22
+php:8.5.0alpha1-fpm-bookworm
+php:8.5.0alpha1-fpm-bullseye
+php:8.5.0alpha1-zts
+php:8.5.0alpha1-zts-alpine
+php:8.5.0alpha1-zts-alpine3.21
+php:8.5.0alpha1-zts-alpine3.22
+php:8.5.0alpha1-zts-bookworm
+php:8.5.0alpha1-zts-bullseye
 php:alpine
 php:alpine3.21
 php:alpine3.22
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 1ce9803..2bd2b05 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -40,6 +40,20 @@ php:8.3-zts
 php:8.3-zts-alpine
 php:8.3-zts-alpine3.21
 php:8.3-zts-bullseye
+php:8.5-rc
+php:8.5-rc-alpine
+php:8.5-rc-alpine3.21
+php:8.5-rc-apache
+php:8.5-rc-apache-bullseye
+php:8.5-rc-bullseye
+php:8.5-rc-fpm
+php:8.5-rc-fpm-alpine
+php:8.5-rc-fpm-alpine3.21
+php:8.5-rc-fpm-bullseye
+php:8.5-rc-zts
+php:8.5-rc-zts-alpine
+php:8.5-rc-zts-alpine3.21
+php:8.5-rc-zts-bullseye
 php:alpine
 php:alpine3.21
 php:apache
diff --git a/php_8.3-alpine/Dockerfile b/php_8.5-rc-alpine/Dockerfile
similarity index 93%
copy from php_8.3-alpine/Dockerfile
copy to php_8.5-rc-alpine/Dockerfile
index aaafb23..383db52 100644
--- a/php_8.3-alpine/Dockerfile
+++ b/php_8.5-rc-alpine/Dockerfile
@@ -54,11 +54,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC C28D937575603EB4ABB725861C0779DC5C0A9DE4 AFD8691FDAEDF03BDF6E460563F15A9B715376CA
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.3.23
-ENV PHP_URL="https://www.php.net/distributions/php-8.3.23.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.3.23.tar.xz.asc"
-ENV PHP_SHA256="08be64700f703bca6ff1284bf1fdaffa37ae1b9734b6559f8350248e8960a6db"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-alpine/docker-php-entrypoint b/php_8.5-rc-alpine/docker-php-entrypoint
similarity index 100%
copy from php_8.1-alpine/docker-php-entrypoint
copy to php_8.5-rc-alpine/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-alpine/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-alpine/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-alpine/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-alpine/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-alpine/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-alpine/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-alpine/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-alpine/docker-php-source
diff --git a/php_8.3-alpine3.21/Dockerfile b/php_8.5-rc-alpine3.21/Dockerfile
similarity index 93%
copy from php_8.3-alpine3.21/Dockerfile
copy to php_8.5-rc-alpine3.21/Dockerfile
index 6191422..00f59a0 100644
--- a/php_8.3-alpine3.21/Dockerfile
+++ b/php_8.5-rc-alpine3.21/Dockerfile
@@ -54,11 +54,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC C28D937575603EB4ABB725861C0779DC5C0A9DE4 AFD8691FDAEDF03BDF6E460563F15A9B715376CA
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.3.23
-ENV PHP_URL="https://www.php.net/distributions/php-8.3.23.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.3.23.tar.xz.asc"
-ENV PHP_SHA256="08be64700f703bca6ff1284bf1fdaffa37ae1b9734b6559f8350248e8960a6db"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-alpine/docker-php-entrypoint b/php_8.5-rc-alpine3.21/docker-php-entrypoint
similarity index 100%
copy from php_8.1-alpine/docker-php-entrypoint
copy to php_8.5-rc-alpine3.21/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-alpine3.21/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-alpine3.21/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-alpine3.21/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-alpine3.21/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-alpine3.21/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-alpine3.21/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-alpine3.21/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-alpine3.21/docker-php-source
diff --git a/php_apache-bullseye/Dockerfile b/php_8.5-rc-apache-bullseye/Dockerfile
similarity index 95%
copy from php_apache-bullseye/Dockerfile
copy to php_8.5-rc-apache-bullseye/Dockerfile
index aa94376..6c22231 100644
--- a/php_apache-bullseye/Dockerfile
+++ b/php_8.5-rc-apache-bullseye/Dockerfile
@@ -116,11 +116,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.4.10
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.10.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.10.tar.xz.asc"
-ENV PHP_SHA256="14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-apache-bullseye/apache2-foreground b/php_8.5-rc-apache-bullseye/apache2-foreground
similarity index 100%
copy from php_8.1-apache-bullseye/apache2-foreground
copy to php_8.5-rc-apache-bullseye/apache2-foreground
diff --git a/php_8.1-apache-bullseye/docker-php-entrypoint b/php_8.5-rc-apache-bullseye/docker-php-entrypoint
similarity index 100%
copy from php_8.1-apache-bullseye/docker-php-entrypoint
copy to php_8.5-rc-apache-bullseye/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-apache-bullseye/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-apache-bullseye/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-apache-bullseye/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-apache-bullseye/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-apache-bullseye/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-apache-bullseye/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-apache-bullseye/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-apache-bullseye/docker-php-source
diff --git a/php_apache/Dockerfile b/php_8.5-rc-apache/Dockerfile
similarity index 95%
copy from php_apache/Dockerfile
copy to php_8.5-rc-apache/Dockerfile
index 2826315..3a3c876 100644
--- a/php_apache/Dockerfile
+++ b/php_8.5-rc-apache/Dockerfile
@@ -118,11 +118,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.4.10
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.10.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.10.tar.xz.asc"
-ENV PHP_SHA256="14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-apache-bullseye/apache2-foreground b/php_8.5-rc-apache/apache2-foreground
similarity index 100%
copy from php_8.1-apache-bullseye/apache2-foreground
copy to php_8.5-rc-apache/apache2-foreground
diff --git a/php_8.1-apache-bullseye/docker-php-entrypoint b/php_8.5-rc-apache/docker-php-entrypoint
similarity index 100%
copy from php_8.1-apache-bullseye/docker-php-entrypoint
copy to php_8.5-rc-apache/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-apache/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-apache/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-apache/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-apache/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-apache/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-apache/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-apache/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-apache/docker-php-source
diff --git a/php_bullseye/Dockerfile b/php_8.5-rc-bullseye/Dockerfile
similarity index 94%
copy from php_bullseye/Dockerfile
copy to php_8.5-rc-bullseye/Dockerfile
index 9169695..949f7c4 100644
--- a/php_bullseye/Dockerfile
+++ b/php_8.5-rc-bullseye/Dockerfile
@@ -58,11 +58,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.4.10
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.10.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.10.tar.xz.asc"
-ENV PHP_SHA256="14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-alpine/docker-php-entrypoint b/php_8.5-rc-bullseye/docker-php-entrypoint
similarity index 100%
copy from php_8.1-alpine/docker-php-entrypoint
copy to php_8.5-rc-bullseye/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-bullseye/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-bullseye/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-bullseye/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-bullseye/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-bullseye/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-bullseye/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-bullseye/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-bullseye/docker-php-source
diff --git a/php_8.3-fpm-alpine/Dockerfile b/php_8.5-rc-fpm-alpine/Dockerfile
similarity index 95%
copy from php_8.3-fpm-alpine/Dockerfile
copy to php_8.5-rc-fpm-alpine/Dockerfile
index d0316c5..de517b4 100644
--- a/php_8.3-fpm-alpine/Dockerfile
+++ b/php_8.5-rc-fpm-alpine/Dockerfile
@@ -54,11 +54,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC C28D937575603EB4ABB725861C0779DC5C0A9DE4 AFD8691FDAEDF03BDF6E460563F15A9B715376CA
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.3.23
-ENV PHP_URL="https://www.php.net/distributions/php-8.3.23.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.3.23.tar.xz.asc"
-ENV PHP_SHA256="08be64700f703bca6ff1284bf1fdaffa37ae1b9734b6559f8350248e8960a6db"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-fpm-alpine/docker-php-entrypoint b/php_8.5-rc-fpm-alpine/docker-php-entrypoint
similarity index 100%
copy from php_8.1-fpm-alpine/docker-php-entrypoint
copy to php_8.5-rc-fpm-alpine/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-fpm-alpine/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-fpm-alpine/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-fpm-alpine/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-fpm-alpine/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-fpm-alpine/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-fpm-alpine/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-fpm-alpine/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-fpm-alpine/docker-php-source
diff --git a/php_8.3-fpm-alpine3.21/Dockerfile b/php_8.5-rc-fpm-alpine3.21/Dockerfile
similarity index 95%
copy from php_8.3-fpm-alpine3.21/Dockerfile
copy to php_8.5-rc-fpm-alpine3.21/Dockerfile
index e7b7d19..649a2f1 100644
--- a/php_8.3-fpm-alpine3.21/Dockerfile
+++ b/php_8.5-rc-fpm-alpine3.21/Dockerfile
@@ -54,11 +54,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC C28D937575603EB4ABB725861C0779DC5C0A9DE4 AFD8691FDAEDF03BDF6E460563F15A9B715376CA
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.3.23
-ENV PHP_URL="https://www.php.net/distributions/php-8.3.23.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.3.23.tar.xz.asc"
-ENV PHP_SHA256="08be64700f703bca6ff1284bf1fdaffa37ae1b9734b6559f8350248e8960a6db"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-fpm-alpine/docker-php-entrypoint b/php_8.5-rc-fpm-alpine3.21/docker-php-entrypoint
similarity index 100%
copy from php_8.1-fpm-alpine/docker-php-entrypoint
copy to php_8.5-rc-fpm-alpine3.21/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-fpm-alpine3.21/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-fpm-alpine3.21/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-fpm-alpine3.21/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-fpm-alpine3.21/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-fpm-alpine3.21/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-fpm-alpine3.21/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-fpm-alpine3.21/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-fpm-alpine3.21/docker-php-source
diff --git a/php_fpm-bullseye/Dockerfile b/php_8.5-rc-fpm-bullseye/Dockerfile
similarity index 95%
copy from php_fpm-bullseye/Dockerfile
copy to php_8.5-rc-fpm-bullseye/Dockerfile
index a967afd..65e8803 100644
--- a/php_fpm-bullseye/Dockerfile
+++ b/php_8.5-rc-fpm-bullseye/Dockerfile
@@ -58,11 +58,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.4.10
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.10.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.10.tar.xz.asc"
-ENV PHP_SHA256="14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-fpm-alpine/docker-php-entrypoint b/php_8.5-rc-fpm-bullseye/docker-php-entrypoint
similarity index 100%
copy from php_8.1-fpm-alpine/docker-php-entrypoint
copy to php_8.5-rc-fpm-bullseye/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-fpm-bullseye/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-fpm-bullseye/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-fpm-bullseye/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-fpm-bullseye/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-fpm-bullseye/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-fpm-bullseye/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-fpm-bullseye/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-fpm-bullseye/docker-php-source
diff --git a/php_fpm/Dockerfile b/php_8.5-rc-fpm/Dockerfile
similarity index 95%
copy from php_fpm/Dockerfile
copy to php_8.5-rc-fpm/Dockerfile
index e28643d..fc02b71 100644
--- a/php_fpm/Dockerfile
+++ b/php_8.5-rc-fpm/Dockerfile
@@ -58,11 +58,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.4.10
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.10.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.10.tar.xz.asc"
-ENV PHP_SHA256="14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-fpm-alpine/docker-php-entrypoint b/php_8.5-rc-fpm/docker-php-entrypoint
similarity index 100%
copy from php_8.1-fpm-alpine/docker-php-entrypoint
copy to php_8.5-rc-fpm/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-fpm/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-fpm/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-fpm/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-fpm/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-fpm/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-fpm/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-fpm/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-fpm/docker-php-source
diff --git a/php_8.3-zts-alpine/Dockerfile b/php_8.5-rc-zts-alpine/Dockerfile
similarity index 94%
copy from php_8.3-zts-alpine/Dockerfile
copy to php_8.5-rc-zts-alpine/Dockerfile
index 5b40736..92bb63a 100644
--- a/php_8.3-zts-alpine/Dockerfile
+++ b/php_8.5-rc-zts-alpine/Dockerfile
@@ -54,11 +54,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC C28D937575603EB4ABB725861C0779DC5C0A9DE4 AFD8691FDAEDF03BDF6E460563F15A9B715376CA
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.3.23
-ENV PHP_URL="https://www.php.net/distributions/php-8.3.23.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.3.23.tar.xz.asc"
-ENV PHP_SHA256="08be64700f703bca6ff1284bf1fdaffa37ae1b9734b6559f8350248e8960a6db"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-alpine/docker-php-entrypoint b/php_8.5-rc-zts-alpine/docker-php-entrypoint
similarity index 100%
copy from php_8.1-alpine/docker-php-entrypoint
copy to php_8.5-rc-zts-alpine/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-zts-alpine/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-zts-alpine/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-zts-alpine/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-zts-alpine/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-zts-alpine/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-zts-alpine/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-zts-alpine/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-zts-alpine/docker-php-source
diff --git a/php_zts-alpine3.21/Dockerfile b/php_8.5-rc-zts-alpine3.21/Dockerfile
similarity index 94%
copy from php_zts-alpine3.21/Dockerfile
copy to php_8.5-rc-zts-alpine3.21/Dockerfile
index f01aa1f..0909864 100644
--- a/php_zts-alpine3.21/Dockerfile
+++ b/php_8.5-rc-zts-alpine3.21/Dockerfile
@@ -54,11 +54,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.4.10
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.10.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.10.tar.xz.asc"
-ENV PHP_SHA256="14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-alpine/docker-php-entrypoint b/php_8.5-rc-zts-alpine3.21/docker-php-entrypoint
similarity index 100%
copy from php_8.1-alpine/docker-php-entrypoint
copy to php_8.5-rc-zts-alpine3.21/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-zts-alpine3.21/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-zts-alpine3.21/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-zts-alpine3.21/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-zts-alpine3.21/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-zts-alpine3.21/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-zts-alpine3.21/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-zts-alpine3.21/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-zts-alpine3.21/docker-php-source
diff --git a/php_zts-bullseye/Dockerfile b/php_8.5-rc-zts-bullseye/Dockerfile
similarity index 94%
copy from php_zts-bullseye/Dockerfile
copy to php_8.5-rc-zts-bullseye/Dockerfile
index 16e4087..c5ea0ec 100644
--- a/php_zts-bullseye/Dockerfile
+++ b/php_8.5-rc-zts-bullseye/Dockerfile
@@ -58,11 +58,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.4.10
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.10.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.10.tar.xz.asc"
-ENV PHP_SHA256="14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-alpine/docker-php-entrypoint b/php_8.5-rc-zts-bullseye/docker-php-entrypoint
similarity index 100%
copy from php_8.1-alpine/docker-php-entrypoint
copy to php_8.5-rc-zts-bullseye/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-zts-bullseye/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-zts-bullseye/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-zts-bullseye/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-zts-bullseye/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-zts-bullseye/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-zts-bullseye/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-zts-bullseye/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-zts-bullseye/docker-php-source
diff --git a/php_8.3-zts/Dockerfile b/php_8.5-rc-zts/Dockerfile
similarity index 94%
copy from php_8.3-zts/Dockerfile
copy to php_8.5-rc-zts/Dockerfile
index 88139a4..4947704 100644
--- a/php_8.3-zts/Dockerfile
+++ b/php_8.5-rc-zts/Dockerfile
@@ -58,11 +58,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC C28D937575603EB4ABB725861C0779DC5C0A9DE4 AFD8691FDAEDF03BDF6E460563F15A9B715376CA
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.3.23
-ENV PHP_URL="https://www.php.net/distributions/php-8.3.23.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.3.23.tar.xz.asc"
-ENV PHP_SHA256="08be64700f703bca6ff1284bf1fdaffa37ae1b9734b6559f8350248e8960a6db"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-alpine/docker-php-entrypoint b/php_8.5-rc-zts/docker-php-entrypoint
similarity index 100%
copy from php_8.1-alpine/docker-php-entrypoint
copy to php_8.5-rc-zts/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc-zts/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc-zts/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc-zts/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc-zts/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc-zts/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc-zts/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc-zts/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc-zts/docker-php-source
diff --git a/php_latest/Dockerfile b/php_8.5-rc/Dockerfile
similarity index 94%
copy from php_latest/Dockerfile
copy to php_8.5-rc/Dockerfile
index 4e10ae6..929014d 100644
--- a/php_latest/Dockerfile
+++ b/php_8.5-rc/Dockerfile
@@ -58,11 +58,11 @@ ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
-ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
+ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.4.10
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.10.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.10.tar.xz.asc"
-ENV PHP_SHA256="14983a9ef8800e6bc2d920739fd386054402f7976ca9cd7f711509496f0d2632"
+ENV PHP_VERSION 8.5.0alpha1
+ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0alpha1.tar.xz.asc"
+ENV PHP_SHA256="f21c207b350de8555b9630a7ac7d0893c553186f1b5027236728b29cc99fe4b4"
 
 RUN set -eux; \
 	\
diff --git a/php_8.1-alpine/docker-php-entrypoint b/php_8.5-rc/docker-php-entrypoint
similarity index 100%
copy from php_8.1-alpine/docker-php-entrypoint
copy to php_8.5-rc/docker-php-entrypoint
diff --git a/php_8.1-alpine/docker-php-ext-configure b/php_8.5-rc/docker-php-ext-configure
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-configure
copy to php_8.5-rc/docker-php-ext-configure
diff --git a/php_8.1-alpine/docker-php-ext-enable b/php_8.5-rc/docker-php-ext-enable
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-enable
copy to php_8.5-rc/docker-php-ext-enable
diff --git a/php_8.1-alpine/docker-php-ext-install b/php_8.5-rc/docker-php-ext-install
similarity index 100%
copy from php_8.1-alpine/docker-php-ext-install
copy to php_8.5-rc/docker-php-ext-install
diff --git a/php_8.1-alpine/docker-php-source b/php_8.5-rc/docker-php-source
similarity index 100%
copy from php_8.1-alpine/docker-php-source
copy to php_8.5-rc/docker-php-source

Relevant Maintainers:

@tianon tianon merged commit c503ca6 into docker-library:master Jul 7, 2025
142 of 147 checks passed
@tianon tianon deleted the php branch July 7, 2025 22:56
reviewtypo3org pushed a commit to TYPO3/typo3 that referenced this pull request Jul 8, 2025
PHP8.5.0alpha1 has been released [1] recently and official php
docker image made available with [2], which allowed us to build
`ghcr.io/typo3/core-testing-php85` image based on it [3][4].

This change allows PHP8.5 to be used as option for the dispatch
wrapper `Build/Scripts/runTests.sh` to start testing locally.

Adding to pre-merge and/or nightly will be done later when it
has been proofen to work.

[1] https://www.php.net/archive/2025.php#2025-07-03-5
[2] docker-library/official-images#19414
[3] https://git.typo3.org/typo3/CI/testing-infrastructure/-/commit/4696cf29b59f42556f8270415281a67871a74482
[4] https://git.typo3.org/typo3/CI/testing-infrastructure/-/commit/6a77e8061989056a593c9cf1888c8d0a04356755

Resolves: #107054
Releases: main, 13.4, 12.4
Change-Id: I71b08475918bf6cc1b95f932301dad83c144f33a
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/90020
Reviewed-by: Garvin Hicking <[email protected]>
Reviewed-by: Christian Kuhn <[email protected]>
Reviewed-by: Stefan Bürk <[email protected]>
Tested-by: Stefan Bürk <[email protected]>
Tested-by: core-ci <[email protected]>
Tested-by: Garvin Hicking <[email protected]>
Tested-by: Christian Kuhn <[email protected]>
reviewtypo3org pushed a commit to TYPO3/typo3 that referenced this pull request Jul 8, 2025
PHP8.5.0alpha1 has been released [1] recently and official php
docker image made available with [2], which allowed us to build
`ghcr.io/typo3/core-testing-php85` image based on it [3][4].

This change allows PHP8.5 to be used as option for the dispatch
wrapper `Build/Scripts/runTests.sh` to start testing locally.

Adding to pre-merge and/or nightly will be done later when it
has been proofen to work.

[1] https://www.php.net/archive/2025.php#2025-07-03-5
[2] docker-library/official-images#19414
[3] https://git.typo3.org/typo3/CI/testing-infrastructure/-/commit/4696cf29b59f42556f8270415281a67871a74482
[4] https://git.typo3.org/typo3/CI/testing-infrastructure/-/commit/6a77e8061989056a593c9cf1888c8d0a04356755

Resolves: #107054
Releases: main, 13.4, 12.4
Change-Id: I71b08475918bf6cc1b95f932301dad83c144f33a
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/90021
Tested-by: core-ci <[email protected]>
Tested-by: Stefan Bürk <[email protected]>
Reviewed-by: Stefan Bürk <[email protected]>
reviewtypo3org pushed a commit to TYPO3/typo3 that referenced this pull request Jul 8, 2025
PHP8.5.0alpha1 has been released [1] recently and official php
docker image made available with [2], which allowed us to build
`ghcr.io/typo3/core-testing-php85` image based on it [3][4].

This change allows PHP8.5 to be used as option for the dispatch
wrapper `Build/Scripts/runTests.sh` to start testing locally.

Adding to pre-merge and/or nightly will be done later when it
has been proofen to work.

[1] https://www.php.net/archive/2025.php#2025-07-03-5
[2] docker-library/official-images#19414
[3] https://git.typo3.org/typo3/CI/testing-infrastructure/-/commit/4696cf29b59f42556f8270415281a67871a74482
[4] https://git.typo3.org/typo3/CI/testing-infrastructure/-/commit/6a77e8061989056a593c9cf1888c8d0a04356755

Resolves: #107054
Releases: main, 13.4, 12.4
Change-Id: I71b08475918bf6cc1b95f932301dad83c144f33a
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/90022
Reviewed-by: Stefan Bürk <[email protected]>
Tested-by: core-ci <[email protected]>
Tested-by: Stefan Bürk <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants