Skip to content

Update php#20755

Merged
tianon merged 1 commit intodocker-library:masterfrom
docker-library-bot:php
Jan 30, 2026
Merged

Update php#20755
tianon merged 1 commit intodocker-library:masterfrom
docker-library-bot:php

Conversation

@yosifkit
Copy link
Member

@yosifkit yosifkit commented Jan 30, 2026

Changes:

@yosifkit yosifkit requested a review from a team as a code owner January 30, 2026 00:28
@github-actions

This comment has been minimized.

Changes:

- docker-library/php@7a6643ee: Fix template conditional
- docker-library/php@f968aa0c: Update 8.5-rc to 8.5.3RC1
- docker-library/php@b28be673: Update 8.4-rc to 8.4.18RC1
- docker-library/php@3a74db04: Docs: Fix typo in Dockerfile comment (docker-library/php#1649)
@github-actions
Copy link

Diff for f8150d3:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 45f2142..075e97e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -103,22 +103,22 @@ Directory: 8.3/trixie/cli
 
 Tags: 8.3.30-fpm-alpine3.22, 8.3-fpm-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.3/alpine3.22/fpm
 
 Tags: 8.3.30-fpm-alpine3.23, 8.3-fpm-alpine3.23, 8.3.30-fpm-alpine, 8.3-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.3/alpine3.23/fpm
 
 Tags: 8.3.30-fpm-bookworm, 8.3-fpm-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.3/bookworm/fpm
 
 Tags: 8.3.30-fpm-trixie, 8.3-fpm-trixie, 8.3.30-fpm, 8.3-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.3/trixie/fpm
 
 Tags: 8.3.30-zts-alpine3.22, 8.3-zts-alpine3.22
@@ -173,22 +173,22 @@ Directory: 8.4/trixie/cli
 
 Tags: 8.4.17-fpm-alpine3.22, 8.4-fpm-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.4/alpine3.22/fpm
 
 Tags: 8.4.17-fpm-alpine3.23, 8.4-fpm-alpine3.23, 8.4.17-fpm-alpine, 8.4-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.4/alpine3.23/fpm
 
 Tags: 8.4.17-fpm-bookworm, 8.4-fpm-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.4/bookworm/fpm
 
 Tags: 8.4.17-fpm-trixie, 8.4-fpm-trixie, 8.4.17-fpm, 8.4-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.4/trixie/fpm
 
 Tags: 8.4.17-zts-alpine3.22, 8.4-zts-alpine3.22
@@ -211,6 +211,76 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 031323936518d710eee20625f7a91b1b4badf1b9
 Directory: 8.4/trixie/zts
 
+Tags: 8.4.18RC1-apache-bookworm, 8.4-rc-apache-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/bookworm/apache
+
+Tags: 8.4.18RC1-apache-trixie, 8.4-rc-apache-trixie, 8.4.18RC1-apache, 8.4-rc-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/trixie/apache
+
+Tags: 8.4.18RC1-cli-alpine3.22, 8.4-rc-cli-alpine3.22, 8.4.18RC1-alpine3.22, 8.4-rc-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/alpine3.22/cli
+
+Tags: 8.4.18RC1-cli-alpine3.23, 8.4-rc-cli-alpine3.23, 8.4.18RC1-alpine3.23, 8.4-rc-alpine3.23, 8.4.18RC1-cli-alpine, 8.4-rc-cli-alpine, 8.4.18RC1-alpine, 8.4-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/alpine3.23/cli
+
+Tags: 8.4.18RC1-cli-bookworm, 8.4-rc-cli-bookworm, 8.4.18RC1-bookworm, 8.4-rc-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/bookworm/cli
+
+Tags: 8.4.18RC1-cli-trixie, 8.4-rc-cli-trixie, 8.4.18RC1-trixie, 8.4-rc-trixie, 8.4.18RC1-cli, 8.4-rc-cli, 8.4.18RC1, 8.4-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/trixie/cli
+
+Tags: 8.4.18RC1-fpm-alpine3.22, 8.4-rc-fpm-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 7a6643eeb093b17a72ba326ec7441b1e1b276862
+Directory: 8.4-rc/alpine3.22/fpm
+
+Tags: 8.4.18RC1-fpm-alpine3.23, 8.4-rc-fpm-alpine3.23, 8.4.18RC1-fpm-alpine, 8.4-rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 7a6643eeb093b17a72ba326ec7441b1e1b276862
+Directory: 8.4-rc/alpine3.23/fpm
+
+Tags: 8.4.18RC1-fpm-bookworm, 8.4-rc-fpm-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7a6643eeb093b17a72ba326ec7441b1e1b276862
+Directory: 8.4-rc/bookworm/fpm
+
+Tags: 8.4.18RC1-fpm-trixie, 8.4-rc-fpm-trixie, 8.4.18RC1-fpm, 8.4-rc-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 7a6643eeb093b17a72ba326ec7441b1e1b276862
+Directory: 8.4-rc/trixie/fpm
+
+Tags: 8.4.18RC1-zts-alpine3.22, 8.4-rc-zts-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/alpine3.22/zts
+
+Tags: 8.4.18RC1-zts-alpine3.23, 8.4-rc-zts-alpine3.23, 8.4.18RC1-zts-alpine, 8.4-rc-zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/alpine3.23/zts
+
+Tags: 8.4.18RC1-zts-bookworm, 8.4-rc-zts-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/bookworm/zts
+
+Tags: 8.4.18RC1-zts-trixie, 8.4-rc-zts-trixie, 8.4.18RC1-zts, 8.4-rc-zts
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: b28be6738f15c9ed69c9b1eb93de0b245a14b671
+Directory: 8.4-rc/trixie/zts
+
 Tags: 8.5.2-apache-bookworm, 8.5-apache-bookworm, 8-apache-bookworm, apache-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 3b4846f29971af7a95aba55871d911d94b96a317
@@ -243,22 +313,22 @@ Directory: 8.5/trixie/cli
 
 Tags: 8.5.2-fpm-alpine3.22, 8.5-fpm-alpine3.22, 8-fpm-alpine3.22, fpm-alpine3.22
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.5/alpine3.22/fpm
 
 Tags: 8.5.2-fpm-alpine3.23, 8.5-fpm-alpine3.23, 8-fpm-alpine3.23, fpm-alpine3.23, 8.5.2-fpm-alpine, 8.5-fpm-alpine, 8-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.5/alpine3.23/fpm
 
 Tags: 8.5.2-fpm-bookworm, 8.5-fpm-bookworm, 8-fpm-bookworm, fpm-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.5/bookworm/fpm
 
 Tags: 8.5.2-fpm-trixie, 8.5-fpm-trixie, 8-fpm-trixie, fpm-trixie, 8.5.2-fpm, 8.5-fpm, 8-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: e5de0e8e53381340069a33c6e50fd3de32246240
+GitCommit: 3a74db043f304883e3553bdca969363399c87b5f
 Directory: 8.5/trixie/fpm
 
 Tags: 8.5.2-zts-alpine3.22, 8.5-zts-alpine3.22, 8-zts-alpine3.22, zts-alpine3.22
@@ -280,3 +350,73 @@ Tags: 8.5.2-zts-trixie, 8.5-zts-trixie, 8-zts-trixie, zts-trixie, 8.5.2-zts, 8.5
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 3b4846f29971af7a95aba55871d911d94b96a317
 Directory: 8.5/trixie/zts
+
+Tags: 8.5.3RC1-apache-bookworm, 8.5-rc-apache-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/bookworm/apache
+
+Tags: 8.5.3RC1-apache-trixie, 8.5-rc-apache-trixie, 8.5.3RC1-apache, 8.5-rc-apache
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/trixie/apache
+
+Tags: 8.5.3RC1-cli-alpine3.22, 8.5-rc-cli-alpine3.22, 8.5.3RC1-alpine3.22, 8.5-rc-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/alpine3.22/cli
+
+Tags: 8.5.3RC1-cli-alpine3.23, 8.5-rc-cli-alpine3.23, 8.5.3RC1-alpine3.23, 8.5-rc-alpine3.23, 8.5.3RC1-cli-alpine, 8.5-rc-cli-alpine, 8.5.3RC1-alpine, 8.5-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/alpine3.23/cli
+
+Tags: 8.5.3RC1-cli-bookworm, 8.5-rc-cli-bookworm, 8.5.3RC1-bookworm, 8.5-rc-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/bookworm/cli
+
+Tags: 8.5.3RC1-cli-trixie, 8.5-rc-cli-trixie, 8.5.3RC1-trixie, 8.5-rc-trixie, 8.5.3RC1-cli, 8.5-rc-cli, 8.5.3RC1, 8.5-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/trixie/cli
+
+Tags: 8.5.3RC1-fpm-alpine3.22, 8.5-rc-fpm-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 7a6643eeb093b17a72ba326ec7441b1e1b276862
+Directory: 8.5-rc/alpine3.22/fpm
+
+Tags: 8.5.3RC1-fpm-alpine3.23, 8.5-rc-fpm-alpine3.23, 8.5.3RC1-fpm-alpine, 8.5-rc-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 7a6643eeb093b17a72ba326ec7441b1e1b276862
+Directory: 8.5-rc/alpine3.23/fpm
+
+Tags: 8.5.3RC1-fpm-bookworm, 8.5-rc-fpm-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 7a6643eeb093b17a72ba326ec7441b1e1b276862
+Directory: 8.5-rc/bookworm/fpm
+
+Tags: 8.5.3RC1-fpm-trixie, 8.5-rc-fpm-trixie, 8.5.3RC1-fpm, 8.5-rc-fpm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 7a6643eeb093b17a72ba326ec7441b1e1b276862
+Directory: 8.5-rc/trixie/fpm
+
+Tags: 8.5.3RC1-zts-alpine3.22, 8.5-rc-zts-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/alpine3.22/zts
+
+Tags: 8.5.3RC1-zts-alpine3.23, 8.5-rc-zts-alpine3.23, 8.5.3RC1-zts-alpine, 8.5-rc-zts-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/alpine3.23/zts
+
+Tags: 8.5.3RC1-zts-bookworm, 8.5-rc-zts-bookworm
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/bookworm/zts
+
+Tags: 8.5.3RC1-zts-trixie, 8.5-rc-zts-trixie, 8.5.3RC1-zts, 8.5-rc-zts
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f968aa0ccb90402cfa51f3d4758c4112a899d252
+Directory: 8.5-rc/trixie/zts
diff --git a/_bashbrew-list b/_bashbrew-list
index fed58c3..91224bb 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -153,6 +153,33 @@ php:8.4-fpm-alpine3.22
 php:8.4-fpm-alpine3.23
 php:8.4-fpm-bookworm
 php:8.4-fpm-trixie
+php:8.4-rc
+php:8.4-rc-alpine
+php:8.4-rc-alpine3.22
+php:8.4-rc-alpine3.23
+php:8.4-rc-apache
+php:8.4-rc-apache-bookworm
+php:8.4-rc-apache-trixie
+php:8.4-rc-bookworm
+php:8.4-rc-cli
+php:8.4-rc-cli-alpine
+php:8.4-rc-cli-alpine3.22
+php:8.4-rc-cli-alpine3.23
+php:8.4-rc-cli-bookworm
+php:8.4-rc-cli-trixie
+php:8.4-rc-fpm
+php:8.4-rc-fpm-alpine
+php:8.4-rc-fpm-alpine3.22
+php:8.4-rc-fpm-alpine3.23
+php:8.4-rc-fpm-bookworm
+php:8.4-rc-fpm-trixie
+php:8.4-rc-trixie
+php:8.4-rc-zts
+php:8.4-rc-zts-alpine
+php:8.4-rc-zts-alpine3.22
+php:8.4-rc-zts-alpine3.23
+php:8.4-rc-zts-bookworm
+php:8.4-rc-zts-trixie
 php:8.4-trixie
 php:8.4-zts
 php:8.4-zts-alpine
@@ -187,6 +214,33 @@ php:8.4.17-zts-alpine3.22
 php:8.4.17-zts-alpine3.23
 php:8.4.17-zts-bookworm
 php:8.4.17-zts-trixie
+php:8.4.18RC1
+php:8.4.18RC1-alpine
+php:8.4.18RC1-alpine3.22
+php:8.4.18RC1-alpine3.23
+php:8.4.18RC1-apache
+php:8.4.18RC1-apache-bookworm
+php:8.4.18RC1-apache-trixie
+php:8.4.18RC1-bookworm
+php:8.4.18RC1-cli
+php:8.4.18RC1-cli-alpine
+php:8.4.18RC1-cli-alpine3.22
+php:8.4.18RC1-cli-alpine3.23
+php:8.4.18RC1-cli-bookworm
+php:8.4.18RC1-cli-trixie
+php:8.4.18RC1-fpm
+php:8.4.18RC1-fpm-alpine
+php:8.4.18RC1-fpm-alpine3.22
+php:8.4.18RC1-fpm-alpine3.23
+php:8.4.18RC1-fpm-bookworm
+php:8.4.18RC1-fpm-trixie
+php:8.4.18RC1-trixie
+php:8.4.18RC1-zts
+php:8.4.18RC1-zts-alpine
+php:8.4.18RC1-zts-alpine3.22
+php:8.4.18RC1-zts-alpine3.23
+php:8.4.18RC1-zts-bookworm
+php:8.4.18RC1-zts-trixie
 php:8.5
 php:8.5-alpine
 php:8.5-alpine3.22
@@ -207,6 +261,33 @@ php:8.5-fpm-alpine3.22
 php:8.5-fpm-alpine3.23
 php:8.5-fpm-bookworm
 php:8.5-fpm-trixie
+php:8.5-rc
+php:8.5-rc-alpine
+php:8.5-rc-alpine3.22
+php:8.5-rc-alpine3.23
+php:8.5-rc-apache
+php:8.5-rc-apache-bookworm
+php:8.5-rc-apache-trixie
+php:8.5-rc-bookworm
+php:8.5-rc-cli
+php:8.5-rc-cli-alpine
+php:8.5-rc-cli-alpine3.22
+php:8.5-rc-cli-alpine3.23
+php:8.5-rc-cli-bookworm
+php:8.5-rc-cli-trixie
+php:8.5-rc-fpm
+php:8.5-rc-fpm-alpine
+php:8.5-rc-fpm-alpine3.22
+php:8.5-rc-fpm-alpine3.23
+php:8.5-rc-fpm-bookworm
+php:8.5-rc-fpm-trixie
+php:8.5-rc-trixie
+php:8.5-rc-zts
+php:8.5-rc-zts-alpine
+php:8.5-rc-zts-alpine3.22
+php:8.5-rc-zts-alpine3.23
+php:8.5-rc-zts-bookworm
+php:8.5-rc-zts-trixie
 php:8.5-trixie
 php:8.5-zts
 php:8.5-zts-alpine
@@ -241,6 +322,33 @@ php:8.5.2-zts-alpine3.22
 php:8.5.2-zts-alpine3.23
 php:8.5.2-zts-bookworm
 php:8.5.2-zts-trixie
+php:8.5.3RC1
+php:8.5.3RC1-alpine
+php:8.5.3RC1-alpine3.22
+php:8.5.3RC1-alpine3.23
+php:8.5.3RC1-apache
+php:8.5.3RC1-apache-bookworm
+php:8.5.3RC1-apache-trixie
+php:8.5.3RC1-bookworm
+php:8.5.3RC1-cli
+php:8.5.3RC1-cli-alpine
+php:8.5.3RC1-cli-alpine3.22
+php:8.5.3RC1-cli-alpine3.23
+php:8.5.3RC1-cli-bookworm
+php:8.5.3RC1-cli-trixie
+php:8.5.3RC1-fpm
+php:8.5.3RC1-fpm-alpine
+php:8.5.3RC1-fpm-alpine3.22
+php:8.5.3RC1-fpm-alpine3.23
+php:8.5.3RC1-fpm-bookworm
+php:8.5.3RC1-fpm-trixie
+php:8.5.3RC1-trixie
+php:8.5.3RC1-zts
+php:8.5.3RC1-zts-alpine
+php:8.5.3RC1-zts-alpine3.22
+php:8.5.3RC1-zts-alpine3.23
+php:8.5.3RC1-zts-bookworm
+php:8.5.3RC1-zts-trixie
 php:alpine
 php:alpine3.22
 php:alpine3.23
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 2c07cac..fd29f15 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -36,10 +36,38 @@ php:8.4-fpm
 php:8.4-fpm-alpine
 php:8.4-fpm-alpine3.22
 php:8.4-fpm-bookworm
+php:8.4-rc
+php:8.4-rc-alpine
+php:8.4-rc-alpine3.22
+php:8.4-rc-apache
+php:8.4-rc-apache-bookworm
+php:8.4-rc-bookworm
+php:8.4-rc-fpm
+php:8.4-rc-fpm-alpine
+php:8.4-rc-fpm-alpine3.22
+php:8.4-rc-fpm-bookworm
+php:8.4-rc-zts
+php:8.4-rc-zts-alpine
+php:8.4-rc-zts-alpine3.22
+php:8.4-rc-zts-bookworm
 php:8.4-zts
 php:8.4-zts-alpine
 php:8.4-zts-alpine3.22
 php:8.4-zts-bookworm
+php:8.5-rc
+php:8.5-rc-alpine
+php:8.5-rc-alpine3.22
+php:8.5-rc-apache
+php:8.5-rc-apache-bookworm
+php:8.5-rc-bookworm
+php:8.5-rc-fpm
+php:8.5-rc-fpm-alpine
+php:8.5-rc-fpm-alpine3.22
+php:8.5-rc-fpm-bookworm
+php:8.5-rc-zts
+php:8.5-rc-zts-alpine
+php:8.5-rc-zts-alpine3.22
+php:8.5-rc-zts-bookworm
 php:alpine
 php:alpine3.22
 php:apache
diff --git a/php_8.3-fpm-alpine/Dockerfile b/php_8.3-fpm-alpine/Dockerfile
index ff82fa9..96c5ff0 100644
--- a/php_8.3-fpm-alpine/Dockerfile
+++ b/php_8.3-fpm-alpine/Dockerfile
@@ -237,7 +237,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.3-fpm-alpine3.22/Dockerfile b/php_8.3-fpm-alpine3.22/Dockerfile
index 62fd59f..09c1cb8 100644
--- a/php_8.3-fpm-alpine3.22/Dockerfile
+++ b/php_8.3-fpm-alpine3.22/Dockerfile
@@ -237,7 +237,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.3-fpm-bookworm/Dockerfile b/php_8.3-fpm-bookworm/Dockerfile
index 9770177..f1564b1 100644
--- a/php_8.3-fpm-bookworm/Dockerfile
+++ b/php_8.3-fpm-bookworm/Dockerfile
@@ -254,7 +254,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.3-fpm/Dockerfile b/php_8.3-fpm/Dockerfile
index 07ec122..b196cac 100644
--- a/php_8.3-fpm/Dockerfile
+++ b/php_8.3-fpm/Dockerfile
@@ -254,7 +254,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.4-fpm-alpine/Dockerfile b/php_8.4-fpm-alpine/Dockerfile
index 29403fd..8468764 100644
--- a/php_8.4-fpm-alpine/Dockerfile
+++ b/php_8.4-fpm-alpine/Dockerfile
@@ -237,7 +237,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.4-fpm-alpine3.22/Dockerfile b/php_8.4-fpm-alpine3.22/Dockerfile
index 8375761..787aa03 100644
--- a/php_8.4-fpm-alpine3.22/Dockerfile
+++ b/php_8.4-fpm-alpine3.22/Dockerfile
@@ -237,7 +237,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.4-fpm-bookworm/Dockerfile b/php_8.4-fpm-bookworm/Dockerfile
index b28f971..409d79c 100644
--- a/php_8.4-fpm-bookworm/Dockerfile
+++ b/php_8.4-fpm-bookworm/Dockerfile
@@ -254,7 +254,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.4-fpm/Dockerfile b/php_8.4-fpm/Dockerfile
index 9c3bd18..778b219 100644
--- a/php_8.4-fpm/Dockerfile
+++ b/php_8.4-fpm/Dockerfile
@@ -254,7 +254,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.4-alpine/Dockerfile b/php_8.4-rc-alpine/Dockerfile
similarity index 96%
copy from php_8.4-alpine/Dockerfile
copy to php_8.4-rc-alpine/Dockerfile
index d63b38d..77d99a7 100644
--- a/php_8.4-alpine/Dockerfile
+++ b/php_8.4-rc-alpine/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.4-rc-alpine/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.4-rc-alpine/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-alpine/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-alpine/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-alpine/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-alpine/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-alpine/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-alpine/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-alpine/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-alpine/docker-php-source
diff --git a/php_8.4-alpine3.22/Dockerfile b/php_8.4-rc-alpine3.22/Dockerfile
similarity index 96%
copy from php_8.4-alpine3.22/Dockerfile
copy to php_8.4-rc-alpine3.22/Dockerfile
index f24503d..e76481f 100644
--- a/php_8.4-alpine3.22/Dockerfile
+++ b/php_8.4-rc-alpine3.22/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.4-rc-alpine3.22/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.4-rc-alpine3.22/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-alpine3.22/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-alpine3.22/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-alpine3.22/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-alpine3.22/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-alpine3.22/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-alpine3.22/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-alpine3.22/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-alpine3.22/docker-php-source
diff --git a/php_8.4-apache-bookworm/Dockerfile b/php_8.4-rc-apache-bookworm/Dockerfile
similarity index 97%
copy from php_8.4-apache-bookworm/Dockerfile
copy to php_8.4-rc-apache-bookworm/Dockerfile
index 06a17c8..c0acf14 100644
--- a/php_8.4-apache-bookworm/Dockerfile
+++ b/php_8.4-rc-apache-bookworm/Dockerfile
@@ -120,9 +120,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-apache-bookworm/apache2-foreground b/php_8.4-rc-apache-bookworm/apache2-foreground
similarity index 100%
copy from php_8.2-apache-bookworm/apache2-foreground
copy to php_8.4-rc-apache-bookworm/apache2-foreground
diff --git a/php_8.2-apache-bookworm/docker-php-entrypoint b/php_8.4-rc-apache-bookworm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-apache-bookworm/docker-php-entrypoint
copy to php_8.4-rc-apache-bookworm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-apache-bookworm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-apache-bookworm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-apache-bookworm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-apache-bookworm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-apache-bookworm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-apache-bookworm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-apache-bookworm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-apache-bookworm/docker-php-source
diff --git a/php_8.4-apache/Dockerfile b/php_8.4-rc-apache/Dockerfile
similarity index 97%
copy from php_8.4-apache/Dockerfile
copy to php_8.4-rc-apache/Dockerfile
index 57976b5..104d258 100644
--- a/php_8.4-apache/Dockerfile
+++ b/php_8.4-rc-apache/Dockerfile
@@ -120,9 +120,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-apache-bookworm/apache2-foreground b/php_8.4-rc-apache/apache2-foreground
similarity index 100%
copy from php_8.2-apache-bookworm/apache2-foreground
copy to php_8.4-rc-apache/apache2-foreground
diff --git a/php_8.2-apache-bookworm/docker-php-entrypoint b/php_8.4-rc-apache/docker-php-entrypoint
similarity index 100%
copy from php_8.2-apache-bookworm/docker-php-entrypoint
copy to php_8.4-rc-apache/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-apache/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-apache/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-apache/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-apache/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-apache/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-apache/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-apache/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-apache/docker-php-source
diff --git a/php_8.4-bookworm/Dockerfile b/php_8.4-rc-bookworm/Dockerfile
similarity index 96%
copy from php_8.4-bookworm/Dockerfile
copy to php_8.4-rc-bookworm/Dockerfile
index 75b374b..8749d3d 100644
--- a/php_8.4-bookworm/Dockerfile
+++ b/php_8.4-rc-bookworm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.4-rc-bookworm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.4-rc-bookworm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-bookworm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-bookworm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-bookworm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-bookworm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-bookworm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-bookworm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-bookworm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-bookworm/docker-php-source
diff --git a/php_8.4-fpm-alpine/Dockerfile b/php_8.4-rc-fpm-alpine/Dockerfile
similarity index 96%
copy from php_8.4-fpm-alpine/Dockerfile
copy to php_8.4-rc-fpm-alpine/Dockerfile
index 29403fd..0e10375 100644
--- a/php_8.4-fpm-alpine/Dockerfile
+++ b/php_8.4-rc-fpm-alpine/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
@@ -237,7 +237,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.2-fpm-alpine/docker-php-entrypoint b/php_8.4-rc-fpm-alpine/docker-php-entrypoint
similarity index 100%
copy from php_8.2-fpm-alpine/docker-php-entrypoint
copy to php_8.4-rc-fpm-alpine/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-fpm-alpine/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-fpm-alpine/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-fpm-alpine/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-fpm-alpine/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-fpm-alpine/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-fpm-alpine/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-fpm-alpine/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-fpm-alpine/docker-php-source
diff --git a/php_8.4-fpm-alpine3.22/Dockerfile b/php_8.4-rc-fpm-alpine3.22/Dockerfile
similarity index 96%
copy from php_8.4-fpm-alpine3.22/Dockerfile
copy to php_8.4-rc-fpm-alpine3.22/Dockerfile
index 8375761..6515521 100644
--- a/php_8.4-fpm-alpine3.22/Dockerfile
+++ b/php_8.4-rc-fpm-alpine3.22/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
@@ -237,7 +237,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.2-fpm-alpine/docker-php-entrypoint b/php_8.4-rc-fpm-alpine3.22/docker-php-entrypoint
similarity index 100%
copy from php_8.2-fpm-alpine/docker-php-entrypoint
copy to php_8.4-rc-fpm-alpine3.22/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-fpm-alpine3.22/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-fpm-alpine3.22/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-fpm-alpine3.22/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-fpm-alpine3.22/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-fpm-alpine3.22/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-fpm-alpine3.22/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-fpm-alpine3.22/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-fpm-alpine3.22/docker-php-source
diff --git a/php_8.4-fpm-bookworm/Dockerfile b/php_8.4-rc-fpm-bookworm/Dockerfile
similarity index 96%
copy from php_8.4-fpm-bookworm/Dockerfile
copy to php_8.4-rc-fpm-bookworm/Dockerfile
index b28f971..2cd0f7b 100644
--- a/php_8.4-fpm-bookworm/Dockerfile
+++ b/php_8.4-rc-fpm-bookworm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
@@ -254,7 +254,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.2-fpm-alpine/docker-php-entrypoint b/php_8.4-rc-fpm-bookworm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-fpm-alpine/docker-php-entrypoint
copy to php_8.4-rc-fpm-bookworm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-fpm-bookworm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-fpm-bookworm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-fpm-bookworm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-fpm-bookworm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-fpm-bookworm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-fpm-bookworm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-fpm-bookworm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-fpm-bookworm/docker-php-source
diff --git a/php_8.4-fpm/Dockerfile b/php_8.4-rc-fpm/Dockerfile
similarity index 96%
copy from php_8.4-fpm/Dockerfile
copy to php_8.4-rc-fpm/Dockerfile
index 9c3bd18..dba9318 100644
--- a/php_8.4-fpm/Dockerfile
+++ b/php_8.4-rc-fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
@@ -254,7 +254,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.2-fpm-alpine/docker-php-entrypoint b/php_8.4-rc-fpm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-fpm-alpine/docker-php-entrypoint
copy to php_8.4-rc-fpm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-fpm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-fpm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-fpm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-fpm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-fpm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-fpm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-fpm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-fpm/docker-php-source
diff --git a/php_8.4-zts-alpine/Dockerfile b/php_8.4-rc-zts-alpine/Dockerfile
similarity index 96%
copy from php_8.4-zts-alpine/Dockerfile
copy to php_8.4-rc-zts-alpine/Dockerfile
index 4063139..1c55bb9 100644
--- a/php_8.4-zts-alpine/Dockerfile
+++ b/php_8.4-rc-zts-alpine/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.4-rc-zts-alpine/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.4-rc-zts-alpine/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-zts-alpine/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-zts-alpine/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-zts-alpine/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-zts-alpine/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-zts-alpine/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-zts-alpine/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-zts-alpine/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-zts-alpine/docker-php-source
diff --git a/php_8.4-zts-alpine3.22/Dockerfile b/php_8.4-rc-zts-alpine3.22/Dockerfile
similarity index 96%
copy from php_8.4-zts-alpine3.22/Dockerfile
copy to php_8.4-rc-zts-alpine3.22/Dockerfile
index 947b0dd..a046fc7 100644
--- a/php_8.4-zts-alpine3.22/Dockerfile
+++ b/php_8.4-rc-zts-alpine3.22/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.4-rc-zts-alpine3.22/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.4-rc-zts-alpine3.22/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-zts-alpine3.22/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-zts-alpine3.22/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-zts-alpine3.22/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-zts-alpine3.22/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-zts-alpine3.22/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-zts-alpine3.22/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-zts-alpine3.22/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-zts-alpine3.22/docker-php-source
diff --git a/php_8.4-zts-bookworm/Dockerfile b/php_8.4-rc-zts-bookworm/Dockerfile
similarity index 96%
copy from php_8.4-zts-bookworm/Dockerfile
copy to php_8.4-rc-zts-bookworm/Dockerfile
index 670c12a..1fd7803 100644
--- a/php_8.4-zts-bookworm/Dockerfile
+++ b/php_8.4-rc-zts-bookworm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.4-rc-zts-bookworm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.4-rc-zts-bookworm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-zts-bookworm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-zts-bookworm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-zts-bookworm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-zts-bookworm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-zts-bookworm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-zts-bookworm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-zts-bookworm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-zts-bookworm/docker-php-source
diff --git a/php_8.4-zts/Dockerfile b/php_8.4-rc-zts/Dockerfile
similarity index 96%
copy from php_8.4-zts/Dockerfile
copy to php_8.4-rc-zts/Dockerfile
index c07ead1..f9565c8 100644
--- a/php_8.4-zts/Dockerfile
+++ b/php_8.4-rc-zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.4-rc-zts/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.4-rc-zts/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc-zts/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc-zts/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc-zts/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc-zts/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc-zts/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc-zts/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc-zts/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc-zts/docker-php-source
diff --git a/php_8.4/Dockerfile b/php_8.4-rc/Dockerfile
similarity index 96%
copy from php_8.4/Dockerfile
copy to php_8.4-rc/Dockerfile
index a93c9bf..8bdb95f 100644
--- a/php_8.4/Dockerfile
+++ b/php_8.4-rc/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256A97AF7600A39A6 0616E93D95AF471243E26761770426E17EBBB3DD
 
-ENV PHP_VERSION 8.4.17
-ENV PHP_URL="https://www.php.net/distributions/php-8.4.17.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.4.17.tar.xz.asc"
-ENV PHP_SHA256="28b234e347286158cae921d61283eb1169d89bc9d2e5f5976567260ff38b0bfa"
+ENV PHP_VERSION 8.4.18RC1
+ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.18RC1.tar.xz.asc"
+ENV PHP_SHA256="71feee47858318279cea6bc30a565076a3f498647a9be47b261c8dbe73069ead"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.4-rc/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.4-rc/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.4-rc/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.4-rc/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.4-rc/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.4-rc/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.4-rc/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.4-rc/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.4-rc/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.4-rc/docker-php-source
diff --git a/php_alpine/Dockerfile b/php_8.5-rc-alpine/Dockerfile
similarity index 96%
copy from php_alpine/Dockerfile
copy to php_8.5-rc-alpine/Dockerfile
index 44fd477..ebae142 100644
--- a/php_alpine/Dockerfile
+++ b/php_8.5-rc-alpine/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.5-rc-alpine/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.5-rc-alpine/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-alpine/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-alpine/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-alpine/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-alpine/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-alpine/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-alpine/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-alpine/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-alpine/docker-php-source
diff --git a/php_alpine3.22/Dockerfile b/php_8.5-rc-alpine3.22/Dockerfile
similarity index 96%
copy from php_alpine3.22/Dockerfile
copy to php_8.5-rc-alpine3.22/Dockerfile
index e5de73d..798cf16 100644
--- a/php_alpine3.22/Dockerfile
+++ b/php_8.5-rc-alpine3.22/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.5-rc-alpine3.22/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.5-rc-alpine3.22/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-alpine3.22/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-alpine3.22/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-alpine3.22/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-alpine3.22/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-alpine3.22/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-alpine3.22/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-alpine3.22/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-alpine3.22/docker-php-source
diff --git a/php_apache-bookworm/Dockerfile b/php_8.5-rc-apache-bookworm/Dockerfile
similarity index 97%
copy from php_apache-bookworm/Dockerfile
copy to php_8.5-rc-apache-bookworm/Dockerfile
index 96dd4f6..68ef378 100644
--- a/php_apache-bookworm/Dockerfile
+++ b/php_8.5-rc-apache-bookworm/Dockerfile
@@ -120,9 +120,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-apache-bookworm/apache2-foreground b/php_8.5-rc-apache-bookworm/apache2-foreground
similarity index 100%
copy from php_8.2-apache-bookworm/apache2-foreground
copy to php_8.5-rc-apache-bookworm/apache2-foreground
diff --git a/php_8.2-apache-bookworm/docker-php-entrypoint b/php_8.5-rc-apache-bookworm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-apache-bookworm/docker-php-entrypoint
copy to php_8.5-rc-apache-bookworm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-apache-bookworm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-apache-bookworm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-apache-bookworm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-apache-bookworm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-apache-bookworm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-apache-bookworm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-apache-bookworm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-apache-bookworm/docker-php-source
diff --git a/php_apache/Dockerfile b/php_8.5-rc-apache/Dockerfile
similarity index 97%
copy from php_apache/Dockerfile
copy to php_8.5-rc-apache/Dockerfile
index 64f3d7f..cdbab63 100644
--- a/php_apache/Dockerfile
+++ b/php_8.5-rc-apache/Dockerfile
@@ -120,9 +120,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-apache-bookworm/apache2-foreground b/php_8.5-rc-apache/apache2-foreground
similarity index 100%
copy from php_8.2-apache-bookworm/apache2-foreground
copy to php_8.5-rc-apache/apache2-foreground
diff --git a/php_8.2-apache-bookworm/docker-php-entrypoint b/php_8.5-rc-apache/docker-php-entrypoint
similarity index 100%
copy from php_8.2-apache-bookworm/docker-php-entrypoint
copy to php_8.5-rc-apache/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-apache/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-apache/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-apache/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-apache/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-apache/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-apache/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-apache/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-apache/docker-php-source
diff --git a/php_bookworm/Dockerfile b/php_8.5-rc-bookworm/Dockerfile
similarity index 96%
copy from php_bookworm/Dockerfile
copy to php_8.5-rc-bookworm/Dockerfile
index 0c562aa..8824cfd 100644
--- a/php_bookworm/Dockerfile
+++ b/php_8.5-rc-bookworm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.5-rc-bookworm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.5-rc-bookworm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-bookworm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-bookworm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-bookworm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-bookworm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-bookworm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-bookworm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-bookworm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-bookworm/docker-php-source
diff --git a/php_fpm-alpine/Dockerfile b/php_8.5-rc-fpm-alpine/Dockerfile
similarity index 95%
copy from php_fpm-alpine/Dockerfile
copy to php_8.5-rc-fpm-alpine/Dockerfile
index af5504c..f255c0f 100644
--- a/php_fpm-alpine/Dockerfile
+++ b/php_8.5-rc-fpm-alpine/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
@@ -234,7 +234,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.2-fpm-alpine/docker-php-entrypoint b/php_8.5-rc-fpm-alpine/docker-php-entrypoint
similarity index 100%
copy from php_8.2-fpm-alpine/docker-php-entrypoint
copy to php_8.5-rc-fpm-alpine/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-fpm-alpine/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-fpm-alpine/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-fpm-alpine/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-fpm-alpine/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-fpm-alpine/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-fpm-alpine/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-fpm-alpine/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-fpm-alpine/docker-php-source
diff --git a/php_fpm-alpine3.22/Dockerfile b/php_8.5-rc-fpm-alpine3.22/Dockerfile
similarity index 95%
copy from php_fpm-alpine3.22/Dockerfile
copy to php_8.5-rc-fpm-alpine3.22/Dockerfile
index a58f3fe..653a99d 100644
--- a/php_fpm-alpine3.22/Dockerfile
+++ b/php_8.5-rc-fpm-alpine3.22/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
@@ -234,7 +234,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.2-fpm-alpine/docker-php-entrypoint b/php_8.5-rc-fpm-alpine3.22/docker-php-entrypoint
similarity index 100%
copy from php_8.2-fpm-alpine/docker-php-entrypoint
copy to php_8.5-rc-fpm-alpine3.22/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-fpm-alpine3.22/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-fpm-alpine3.22/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-fpm-alpine3.22/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-fpm-alpine3.22/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-fpm-alpine3.22/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-fpm-alpine3.22/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-fpm-alpine3.22/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-fpm-alpine3.22/docker-php-source
diff --git a/php_fpm-bookworm/Dockerfile b/php_8.5-rc-fpm-bookworm/Dockerfile
similarity index 96%
copy from php_fpm-bookworm/Dockerfile
copy to php_8.5-rc-fpm-bookworm/Dockerfile
index fe86a85..b1cdf05 100644
--- a/php_fpm-bookworm/Dockerfile
+++ b/php_8.5-rc-fpm-bookworm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
@@ -251,7 +251,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.2-fpm-alpine/docker-php-entrypoint b/php_8.5-rc-fpm-bookworm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-fpm-alpine/docker-php-entrypoint
copy to php_8.5-rc-fpm-bookworm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-fpm-bookworm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-fpm-bookworm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-fpm-bookworm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-fpm-bookworm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-fpm-bookworm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-fpm-bookworm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-fpm-bookworm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-fpm-bookworm/docker-php-source
diff --git a/php_fpm/Dockerfile b/php_8.5-rc-fpm/Dockerfile
similarity index 96%
copy from php_fpm/Dockerfile
copy to php_8.5-rc-fpm/Dockerfile
index e595ca4..200b9ef 100644
--- a/php_fpm/Dockerfile
+++ b/php_8.5-rc-fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
@@ -251,7 +251,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_8.2-fpm-alpine/docker-php-entrypoint b/php_8.5-rc-fpm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-fpm-alpine/docker-php-entrypoint
copy to php_8.5-rc-fpm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-fpm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-fpm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-fpm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-fpm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-fpm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-fpm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-fpm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-fpm/docker-php-source
diff --git a/php_zts-alpine/Dockerfile b/php_8.5-rc-zts-alpine/Dockerfile
similarity index 96%
copy from php_zts-alpine/Dockerfile
copy to php_8.5-rc-zts-alpine/Dockerfile
index 1262237..20bf34f 100644
--- a/php_zts-alpine/Dockerfile
+++ b/php_8.5-rc-zts-alpine/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.5-rc-zts-alpine/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.5-rc-zts-alpine/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-zts-alpine/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-zts-alpine/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-zts-alpine/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-zts-alpine/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-zts-alpine/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-zts-alpine/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-zts-alpine/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-zts-alpine/docker-php-source
diff --git a/php_zts-alpine3.22/Dockerfile b/php_8.5-rc-zts-alpine3.22/Dockerfile
similarity index 96%
copy from php_zts-alpine3.22/Dockerfile
copy to php_8.5-rc-zts-alpine3.22/Dockerfile
index 9c1f9f6..da044b4 100644
--- a/php_zts-alpine3.22/Dockerfile
+++ b/php_8.5-rc-zts-alpine3.22/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.5-rc-zts-alpine3.22/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.5-rc-zts-alpine3.22/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-zts-alpine3.22/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-zts-alpine3.22/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-zts-alpine3.22/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-zts-alpine3.22/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-zts-alpine3.22/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-zts-alpine3.22/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-zts-alpine3.22/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-zts-alpine3.22/docker-php-source
diff --git a/php_zts-bookworm/Dockerfile b/php_8.5-rc-zts-bookworm/Dockerfile
similarity index 96%
copy from php_zts-bookworm/Dockerfile
copy to php_8.5-rc-zts-bookworm/Dockerfile
index 96338a3..0aeba76 100644
--- a/php_zts-bookworm/Dockerfile
+++ b/php_8.5-rc-zts-bookworm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.5-rc-zts-bookworm/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.5-rc-zts-bookworm/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-zts-bookworm/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-zts-bookworm/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-zts-bookworm/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-zts-bookworm/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-zts-bookworm/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-zts-bookworm/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-zts-bookworm/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc-zts-bookworm/docker-php-source
diff --git a/php_zts/Dockerfile b/php_8.5-rc-zts/Dockerfile
similarity index 96%
copy from php_zts/Dockerfile
copy to php_8.5-rc-zts/Dockerfile
index 1fdbd75..dc94ddf 100644
--- a/php_zts/Dockerfile
+++ b/php_8.5-rc-zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.5-rc-zts/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.5-rc-zts/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc-zts/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc-zts/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc-zts/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc-zts/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc-zts/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc-zts/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc-zts/docker-php-source
similarity index 100%
copy from php_8.2-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 96%
copy from php_latest/Dockerfile
copy to php_8.5-rc/Dockerfile
index adfa09f..1782089 100644
--- a/php_latest/Dockerfile
+++ b/php_8.5-rc/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.2
-ENV PHP_URL="https://www.php.net/distributions/php-8.5.2.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.2.tar.xz.asc"
-ENV PHP_SHA256="cb75a9b00a2806f7390dd64858ef42a47b443b3475769c8af6af33a18b1381f1"
+ENV PHP_VERSION 8.5.3RC1
+ENV PHP_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~edorian/php-8.5.3RC1.tar.xz.asc"
+ENV PHP_SHA256="a73812e2b30a5f40833432fb329c51ca5ed3099180940090a5ebdb6303a1280a"
 
 RUN set -eux; \
 	\
diff --git a/php_8.2-alpine/docker-php-entrypoint b/php_8.5-rc/docker-php-entrypoint
similarity index 100%
copy from php_8.2-alpine/docker-php-entrypoint
copy to php_8.5-rc/docker-php-entrypoint
diff --git a/php_8.2-alpine/docker-php-ext-configure b/php_8.5-rc/docker-php-ext-configure
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-configure
copy to php_8.5-rc/docker-php-ext-configure
diff --git a/php_8.2-alpine/docker-php-ext-enable b/php_8.5-rc/docker-php-ext-enable
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-enable
copy to php_8.5-rc/docker-php-ext-enable
diff --git a/php_8.2-alpine/docker-php-ext-install b/php_8.5-rc/docker-php-ext-install
similarity index 100%
copy from php_8.2-alpine/docker-php-ext-install
copy to php_8.5-rc/docker-php-ext-install
diff --git a/php_8.2-alpine/docker-php-source b/php_8.5-rc/docker-php-source
similarity index 100%
copy from php_8.2-alpine/docker-php-source
copy to php_8.5-rc/docker-php-source
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine/Dockerfile
index af5504c..ac59111 100644
--- a/php_fpm-alpine/Dockerfile
+++ b/php_fpm-alpine/Dockerfile
@@ -234,7 +234,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_fpm-alpine3.22/Dockerfile b/php_fpm-alpine3.22/Dockerfile
index a58f3fe..cfb40cb 100644
--- a/php_fpm-alpine3.22/Dockerfile
+++ b/php_fpm-alpine3.22/Dockerfile
@@ -234,7 +234,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_fpm-bookworm/Dockerfile b/php_fpm-bookworm/Dockerfile
index fe86a85..d79bd41 100644
--- a/php_fpm-bookworm/Dockerfile
+++ b/php_fpm-bookworm/Dockerfile
@@ -251,7 +251,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \
diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile
index e595ca4..f132b7f 100644
--- a/php_fpm/Dockerfile
+++ b/php_fpm/Dockerfile
@@ -251,7 +251,7 @@ RUN set -eux; \
 		echo 'catch_workers_output = yes'; \
 		echo 'decorate_workers_output = no'; \
 		echo; \
-		echo '; default listen adddress for easy override in later php-fpm.d/*.conf files'; \
+		echo '; default listen address for easy override in later php-fpm.d/*.conf files'; \
 		echo 'listen = 9000'; \
 	} | tee php-fpm.d/docker.conf; \
 	{ \

Relevant Maintainers:

@tianon tianon merged commit e1cea48 into docker-library:master Jan 30, 2026
89 checks passed
@tianon tianon deleted the php branch January 30, 2026 01:02
keeganwitt pushed a commit to keeganwitt/docker-library-official-images that referenced this pull request Feb 3, 2026
Changes:

- docker-library/php@7a6643ee: Fix template conditional
- docker-library/php@f968aa0c: Update 8.5-rc to 8.5.3RC1
- docker-library/php@b28be673: Update 8.4-rc to 8.4.18RC1
- docker-library/php@3a74db04: Docs: Fix typo in Dockerfile comment (docker-library/php#1649)

Co-authored-by: Docker Library Bot <doi+docker-library-bot@docker.com>
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.

3 participants