Update php#20610
Merged
tianon merged 1 commit intodocker-library:masterfrom Jan 9, 2026
Merged
Conversation
Changes: - docker-library/php@6485b53a: Set `sysconfdir` explicitly during build (docker-library/php#1636) - docker-library/php@f26909cd: Move fpm listen for easier config override (docker-library/php#1635) - docker-library/php@bc5b3fdc: Move `variants` calculation into `jq` (docker-library/php#1640) - docker-library/php@91d35430: Post 8.1 EOL cleanup (docker-library/php#1642)
Diff for d876bb2:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 80b9d0d..c317c34 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,490 +3,490 @@ GitRepo: https://github.com/docker-library/php.git
Tags: 8.2.30-apache-bookworm, 8.2-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/bookworm/apache
Tags: 8.2.30-apache-trixie, 8.2-apache-trixie, 8.2.30-apache, 8.2-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/trixie/apache
Tags: 8.2.30-cli-alpine3.22, 8.2-cli-alpine3.22, 8.2.30-alpine3.22, 8.2-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/alpine3.22/cli
Tags: 8.2.30-cli-alpine3.23, 8.2-cli-alpine3.23, 8.2.30-alpine3.23, 8.2-alpine3.23, 8.2.30-cli-alpine, 8.2-cli-alpine, 8.2.30-alpine, 8.2-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/alpine3.23/cli
Tags: 8.2.30-cli-bookworm, 8.2-cli-bookworm, 8.2.30-bookworm, 8.2-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/bookworm/cli
Tags: 8.2.30-cli-trixie, 8.2-cli-trixie, 8.2.30-trixie, 8.2-trixie, 8.2.30-cli, 8.2-cli, 8.2.30, 8.2
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/trixie/cli
Tags: 8.2.30-fpm-alpine3.22, 8.2-fpm-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/alpine3.22/fpm
Tags: 8.2.30-fpm-alpine3.23, 8.2-fpm-alpine3.23, 8.2.30-fpm-alpine, 8.2-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/alpine3.23/fpm
Tags: 8.2.30-fpm-bookworm, 8.2-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/bookworm/fpm
Tags: 8.2.30-fpm-trixie, 8.2-fpm-trixie, 8.2.30-fpm, 8.2-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/trixie/fpm
Tags: 8.2.30-zts-alpine3.22, 8.2-zts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/alpine3.22/zts
Tags: 8.2.30-zts-alpine3.23, 8.2-zts-alpine3.23, 8.2.30-zts-alpine, 8.2-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/alpine3.23/zts
Tags: 8.2.30-zts-bookworm, 8.2-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/bookworm/zts
Tags: 8.2.30-zts-trixie, 8.2-zts-trixie, 8.2.30-zts, 8.2-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a5cbc2e51fc91e5f8f00e8a30a1dcf6a58534db9
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.2/trixie/zts
Tags: 8.3.29-apache-bookworm, 8.3-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/bookworm/apache
Tags: 8.3.29-apache-trixie, 8.3-apache-trixie, 8.3.29-apache, 8.3-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/trixie/apache
Tags: 8.3.29-cli-alpine3.22, 8.3-cli-alpine3.22, 8.3.29-alpine3.22, 8.3-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/alpine3.22/cli
Tags: 8.3.29-cli-alpine3.23, 8.3-cli-alpine3.23, 8.3.29-alpine3.23, 8.3-alpine3.23, 8.3.29-cli-alpine, 8.3-cli-alpine, 8.3.29-alpine, 8.3-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/alpine3.23/cli
Tags: 8.3.29-cli-bookworm, 8.3-cli-bookworm, 8.3.29-bookworm, 8.3-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/bookworm/cli
Tags: 8.3.29-cli-trixie, 8.3-cli-trixie, 8.3.29-trixie, 8.3-trixie, 8.3.29-cli, 8.3-cli, 8.3.29, 8.3
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/trixie/cli
Tags: 8.3.29-fpm-alpine3.22, 8.3-fpm-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/alpine3.22/fpm
Tags: 8.3.29-fpm-alpine3.23, 8.3-fpm-alpine3.23, 8.3.29-fpm-alpine, 8.3-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/alpine3.23/fpm
Tags: 8.3.29-fpm-bookworm, 8.3-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/bookworm/fpm
Tags: 8.3.29-fpm-trixie, 8.3-fpm-trixie, 8.3.29-fpm, 8.3-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/trixie/fpm
Tags: 8.3.29-zts-alpine3.22, 8.3-zts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/alpine3.22/zts
Tags: 8.3.29-zts-alpine3.23, 8.3-zts-alpine3.23, 8.3.29-zts-alpine, 8.3-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/alpine3.23/zts
Tags: 8.3.29-zts-bookworm, 8.3-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/bookworm/zts
Tags: 8.3.29-zts-trixie, 8.3-zts-trixie, 8.3.29-zts, 8.3-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 4ec8d1a273d591fb56b15780438721264ffaf073
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3/trixie/zts
Tags: 8.3.30RC1-apache-bookworm, 8.3-rc-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/bookworm/apache
Tags: 8.3.30RC1-apache-trixie, 8.3-rc-apache-trixie, 8.3.30RC1-apache, 8.3-rc-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/trixie/apache
Tags: 8.3.30RC1-cli-alpine3.22, 8.3-rc-cli-alpine3.22, 8.3.30RC1-alpine3.22, 8.3-rc-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/alpine3.22/cli
Tags: 8.3.30RC1-cli-alpine3.23, 8.3-rc-cli-alpine3.23, 8.3.30RC1-alpine3.23, 8.3-rc-alpine3.23, 8.3.30RC1-cli-alpine, 8.3-rc-cli-alpine, 8.3.30RC1-alpine, 8.3-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/alpine3.23/cli
Tags: 8.3.30RC1-cli-bookworm, 8.3-rc-cli-bookworm, 8.3.30RC1-bookworm, 8.3-rc-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/bookworm/cli
Tags: 8.3.30RC1-cli-trixie, 8.3-rc-cli-trixie, 8.3.30RC1-trixie, 8.3-rc-trixie, 8.3.30RC1-cli, 8.3-rc-cli, 8.3.30RC1, 8.3-rc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/trixie/cli
Tags: 8.3.30RC1-fpm-alpine3.22, 8.3-rc-fpm-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/alpine3.22/fpm
Tags: 8.3.30RC1-fpm-alpine3.23, 8.3-rc-fpm-alpine3.23, 8.3.30RC1-fpm-alpine, 8.3-rc-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/alpine3.23/fpm
Tags: 8.3.30RC1-fpm-bookworm, 8.3-rc-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/bookworm/fpm
Tags: 8.3.30RC1-fpm-trixie, 8.3-rc-fpm-trixie, 8.3.30RC1-fpm, 8.3-rc-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/trixie/fpm
Tags: 8.3.30RC1-zts-alpine3.22, 8.3-rc-zts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/alpine3.22/zts
Tags: 8.3.30RC1-zts-alpine3.23, 8.3-rc-zts-alpine3.23, 8.3.30RC1-zts-alpine, 8.3-rc-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/alpine3.23/zts
Tags: 8.3.30RC1-zts-bookworm, 8.3-rc-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/bookworm/zts
Tags: 8.3.30RC1-zts-trixie, 8.3-rc-zts-trixie, 8.3.30RC1-zts, 8.3-rc-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 685496435c53b46ee37b43c1d7e1671848072c39
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.3-rc/trixie/zts
Tags: 8.4.16-apache-bookworm, 8.4-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/bookworm/apache
Tags: 8.4.16-apache-trixie, 8.4-apache-trixie, 8.4.16-apache, 8.4-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/trixie/apache
Tags: 8.4.16-cli-alpine3.22, 8.4-cli-alpine3.22, 8.4.16-alpine3.22, 8.4-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/alpine3.22/cli
Tags: 8.4.16-cli-alpine3.23, 8.4-cli-alpine3.23, 8.4.16-alpine3.23, 8.4-alpine3.23, 8.4.16-cli-alpine, 8.4-cli-alpine, 8.4.16-alpine, 8.4-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/alpine3.23/cli
Tags: 8.4.16-cli-bookworm, 8.4-cli-bookworm, 8.4.16-bookworm, 8.4-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/bookworm/cli
Tags: 8.4.16-cli-trixie, 8.4-cli-trixie, 8.4.16-trixie, 8.4-trixie, 8.4.16-cli, 8.4-cli, 8.4.16, 8.4
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/trixie/cli
Tags: 8.4.16-fpm-alpine3.22, 8.4-fpm-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/alpine3.22/fpm
Tags: 8.4.16-fpm-alpine3.23, 8.4-fpm-alpine3.23, 8.4.16-fpm-alpine, 8.4-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/alpine3.23/fpm
Tags: 8.4.16-fpm-bookworm, 8.4-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/bookworm/fpm
Tags: 8.4.16-fpm-trixie, 8.4-fpm-trixie, 8.4.16-fpm, 8.4-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/trixie/fpm
Tags: 8.4.16-zts-alpine3.22, 8.4-zts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/alpine3.22/zts
Tags: 8.4.16-zts-alpine3.23, 8.4-zts-alpine3.23, 8.4.16-zts-alpine, 8.4-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/alpine3.23/zts
Tags: 8.4.16-zts-bookworm, 8.4-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/bookworm/zts
Tags: 8.4.16-zts-trixie, 8.4-zts-trixie, 8.4.16-zts, 8.4-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 2b98566d51f5856a9bbff14d299d6614274e4baa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4/trixie/zts
Tags: 8.4.17RC1-apache-bookworm, 8.4-rc-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/bookworm/apache
Tags: 8.4.17RC1-apache-trixie, 8.4-rc-apache-trixie, 8.4.17RC1-apache, 8.4-rc-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/trixie/apache
Tags: 8.4.17RC1-cli-alpine3.22, 8.4-rc-cli-alpine3.22, 8.4.17RC1-alpine3.22, 8.4-rc-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/alpine3.22/cli
Tags: 8.4.17RC1-cli-alpine3.23, 8.4-rc-cli-alpine3.23, 8.4.17RC1-alpine3.23, 8.4-rc-alpine3.23, 8.4.17RC1-cli-alpine, 8.4-rc-cli-alpine, 8.4.17RC1-alpine, 8.4-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/alpine3.23/cli
Tags: 8.4.17RC1-cli-bookworm, 8.4-rc-cli-bookworm, 8.4.17RC1-bookworm, 8.4-rc-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/bookworm/cli
Tags: 8.4.17RC1-cli-trixie, 8.4-rc-cli-trixie, 8.4.17RC1-trixie, 8.4-rc-trixie, 8.4.17RC1-cli, 8.4-rc-cli, 8.4.17RC1, 8.4-rc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/trixie/cli
Tags: 8.4.17RC1-fpm-alpine3.22, 8.4-rc-fpm-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/alpine3.22/fpm
Tags: 8.4.17RC1-fpm-alpine3.23, 8.4-rc-fpm-alpine3.23, 8.4.17RC1-fpm-alpine, 8.4-rc-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/alpine3.23/fpm
Tags: 8.4.17RC1-fpm-bookworm, 8.4-rc-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/bookworm/fpm
Tags: 8.4.17RC1-fpm-trixie, 8.4-rc-fpm-trixie, 8.4.17RC1-fpm, 8.4-rc-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/trixie/fpm
Tags: 8.4.17RC1-zts-alpine3.22, 8.4-rc-zts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/alpine3.22/zts
Tags: 8.4.17RC1-zts-alpine3.23, 8.4-rc-zts-alpine3.23, 8.4.17RC1-zts-alpine, 8.4-rc-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/alpine3.23/zts
Tags: 8.4.17RC1-zts-bookworm, 8.4-rc-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/bookworm/zts
Tags: 8.4.17RC1-zts-trixie, 8.4-rc-zts-trixie, 8.4.17RC1-zts, 8.4-rc-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: be2cb18ac76a03aada34d08e35da6b069b46d147
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.4-rc/trixie/zts
Tags: 8.5.1-apache-bookworm, 8.5-apache-bookworm, 8-apache-bookworm, apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/bookworm/apache
Tags: 8.5.1-apache-trixie, 8.5-apache-trixie, 8-apache-trixie, apache-trixie, 8.5.1-apache, 8.5-apache, 8-apache, apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/trixie/apache
Tags: 8.5.1-cli-alpine3.22, 8.5-cli-alpine3.22, 8-cli-alpine3.22, cli-alpine3.22, 8.5.1-alpine3.22, 8.5-alpine3.22, 8-alpine3.22, alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/alpine3.22/cli
Tags: 8.5.1-cli-alpine3.23, 8.5-cli-alpine3.23, 8-cli-alpine3.23, cli-alpine3.23, 8.5.1-alpine3.23, 8.5-alpine3.23, 8-alpine3.23, alpine3.23, 8.5.1-cli-alpine, 8.5-cli-alpine, 8-cli-alpine, cli-alpine, 8.5.1-alpine, 8.5-alpine, 8-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/alpine3.23/cli
Tags: 8.5.1-cli-bookworm, 8.5-cli-bookworm, 8-cli-bookworm, cli-bookworm, 8.5.1-bookworm, 8.5-bookworm, 8-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/bookworm/cli
Tags: 8.5.1-cli-trixie, 8.5-cli-trixie, 8-cli-trixie, cli-trixie, 8.5.1-trixie, 8.5-trixie, 8-trixie, trixie, 8.5.1-cli, 8.5-cli, 8-cli, cli, 8.5.1, 8.5, 8, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/trixie/cli
Tags: 8.5.1-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: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/alpine3.22/fpm
Tags: 8.5.1-fpm-alpine3.23, 8.5-fpm-alpine3.23, 8-fpm-alpine3.23, fpm-alpine3.23, 8.5.1-fpm-alpine, 8.5-fpm-alpine, 8-fpm-alpine, fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/alpine3.23/fpm
Tags: 8.5.1-fpm-bookworm, 8.5-fpm-bookworm, 8-fpm-bookworm, fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/bookworm/fpm
Tags: 8.5.1-fpm-trixie, 8.5-fpm-trixie, 8-fpm-trixie, fpm-trixie, 8.5.1-fpm, 8.5-fpm, 8-fpm, fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/trixie/fpm
Tags: 8.5.1-zts-alpine3.22, 8.5-zts-alpine3.22, 8-zts-alpine3.22, zts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/alpine3.22/zts
Tags: 8.5.1-zts-alpine3.23, 8.5-zts-alpine3.23, 8-zts-alpine3.23, zts-alpine3.23, 8.5.1-zts-alpine, 8.5-zts-alpine, 8-zts-alpine, zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/alpine3.23/zts
Tags: 8.5.1-zts-bookworm, 8.5-zts-bookworm, 8-zts-bookworm, zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/bookworm/zts
Tags: 8.5.1-zts-trixie, 8.5-zts-trixie, 8-zts-trixie, zts-trixie, 8.5.1-zts, 8.5-zts, 8-zts, zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9ed36f437441cc3d7301d136d0c8cfc418dcf1aa
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5/trixie/zts
Tags: 8.5.2RC1-apache-bookworm, 8.5-rc-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/bookworm/apache
Tags: 8.5.2RC1-apache-trixie, 8.5-rc-apache-trixie, 8.5.2RC1-apache, 8.5-rc-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/trixie/apache
Tags: 8.5.2RC1-cli-alpine3.22, 8.5-rc-cli-alpine3.22, 8.5.2RC1-alpine3.22, 8.5-rc-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/alpine3.22/cli
Tags: 8.5.2RC1-cli-alpine3.23, 8.5-rc-cli-alpine3.23, 8.5.2RC1-alpine3.23, 8.5-rc-alpine3.23, 8.5.2RC1-cli-alpine, 8.5-rc-cli-alpine, 8.5.2RC1-alpine, 8.5-rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/alpine3.23/cli
Tags: 8.5.2RC1-cli-bookworm, 8.5-rc-cli-bookworm, 8.5.2RC1-bookworm, 8.5-rc-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/bookworm/cli
Tags: 8.5.2RC1-cli-trixie, 8.5-rc-cli-trixie, 8.5.2RC1-trixie, 8.5-rc-trixie, 8.5.2RC1-cli, 8.5-rc-cli, 8.5.2RC1, 8.5-rc
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/trixie/cli
Tags: 8.5.2RC1-fpm-alpine3.22, 8.5-rc-fpm-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/alpine3.22/fpm
Tags: 8.5.2RC1-fpm-alpine3.23, 8.5-rc-fpm-alpine3.23, 8.5.2RC1-fpm-alpine, 8.5-rc-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/alpine3.23/fpm
Tags: 8.5.2RC1-fpm-bookworm, 8.5-rc-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/bookworm/fpm
Tags: 8.5.2RC1-fpm-trixie, 8.5-rc-fpm-trixie, 8.5.2RC1-fpm, 8.5-rc-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/trixie/fpm
Tags: 8.5.2RC1-zts-alpine3.22, 8.5-rc-zts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/alpine3.22/zts
Tags: 8.5.2RC1-zts-alpine3.23, 8.5-rc-zts-alpine3.23, 8.5.2RC1-zts-alpine, 8.5-rc-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/alpine3.23/zts
Tags: 8.5.2RC1-zts-bookworm, 8.5-rc-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/bookworm/zts
Tags: 8.5.2RC1-zts-trixie, 8.5-rc-zts-trixie, 8.5.2RC1-zts, 8.5-rc-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 0d2677ff25ecb7aaf880f4958797bc991d8cd282
+GitCommit: 6485b53a1da0f2c4c5b564808de75ae62c023286
Directory: 8.5-rc/trixie/zts
diff --git a/php_8.2-alpine/Dockerfile b/php_8.2-alpine/Dockerfile
index 89e4040..472ec20 100644
--- a/php_8.2-alpine/Dockerfile
+++ b/php_8.2-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.2-alpine3.22/Dockerfile b/php_8.2-alpine3.22/Dockerfile
index 09e5203..06e1b11 100644
--- a/php_8.2-alpine3.22/Dockerfile
+++ b/php_8.2-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.2-apache-bookworm/Dockerfile b/php_8.2-apache-bookworm/Dockerfile
index 24a08af..d75f740 100644
--- a/php_8.2-apache-bookworm/Dockerfile
+++ b/php_8.2-apache-bookworm/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.2-apache/Dockerfile b/php_8.2-apache/Dockerfile
index dfa2045..3ef955c 100644
--- a/php_8.2-apache/Dockerfile
+++ b/php_8.2-apache/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.2-bookworm/Dockerfile b/php_8.2-bookworm/Dockerfile
index 3bdc226..9d2c922 100644
--- a/php_8.2-bookworm/Dockerfile
+++ b/php_8.2-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.2-fpm-alpine/Dockerfile b/php_8.2-fpm-alpine/Dockerfile
index 91c18ed..875fc69 100644
--- a/php_8.2-fpm-alpine/Dockerfile
+++ b/php_8.2-fpm-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -213,20 +215,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.2-fpm-alpine3.22/Dockerfile b/php_8.2-fpm-alpine3.22/Dockerfile
index 93b4f21..eb88470 100644
--- a/php_8.2-fpm-alpine3.22/Dockerfile
+++ b/php_8.2-fpm-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -213,20 +215,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.2-fpm-bookworm/Dockerfile b/php_8.2-fpm-bookworm/Dockerfile
index ef0ad23..4eb1c4e 100644
--- a/php_8.2-fpm-bookworm/Dockerfile
+++ b/php_8.2-fpm-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -230,20 +232,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.2-fpm/Dockerfile b/php_8.2-fpm/Dockerfile
index c89d8a1..e3d8bc1 100644
--- a/php_8.2-fpm/Dockerfile
+++ b/php_8.2-fpm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -230,20 +232,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.2-zts-alpine/Dockerfile b/php_8.2-zts-alpine/Dockerfile
index 698c31a..1e87572 100644
--- a/php_8.2-zts-alpine/Dockerfile
+++ b/php_8.2-zts-alpine/Dockerfile
@@ -124,8 +124,10 @@ RUN set -eux; \
filterdiff -x '*/NEWS' 18743.patch | patch -p1; \
rm 18743.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.2-zts-alpine3.22/Dockerfile b/php_8.2-zts-alpine3.22/Dockerfile
index a898f0e..8047698 100644
--- a/php_8.2-zts-alpine3.22/Dockerfile
+++ b/php_8.2-zts-alpine3.22/Dockerfile
@@ -124,8 +124,10 @@ RUN set -eux; \
filterdiff -x '*/NEWS' 18743.patch | patch -p1; \
rm 18743.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.2-zts-bookworm/Dockerfile b/php_8.2-zts-bookworm/Dockerfile
index 0e693be..9edffa8 100644
--- a/php_8.2-zts-bookworm/Dockerfile
+++ b/php_8.2-zts-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.2-zts/Dockerfile b/php_8.2-zts/Dockerfile
index bfee2c1..0650f31 100644
--- a/php_8.2-zts/Dockerfile
+++ b/php_8.2-zts/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.2/Dockerfile b/php_8.2/Dockerfile
index 6d1f2ee..be20bb2 100644
--- a/php_8.2/Dockerfile
+++ b/php_8.2/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-alpine/Dockerfile b/php_8.3-alpine/Dockerfile
index 2d9ab9a..575f0dc 100644
--- a/php_8.3-alpine/Dockerfile
+++ b/php_8.3-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-alpine3.22/Dockerfile b/php_8.3-alpine3.22/Dockerfile
index a043510..9640808 100644
--- a/php_8.3-alpine3.22/Dockerfile
+++ b/php_8.3-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-apache-bookworm/Dockerfile b/php_8.3-apache-bookworm/Dockerfile
index c46d9a4..f900c73 100644
--- a/php_8.3-apache-bookworm/Dockerfile
+++ b/php_8.3-apache-bookworm/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-apache/Dockerfile b/php_8.3-apache/Dockerfile
index 0459c27..dbe142c 100644
--- a/php_8.3-apache/Dockerfile
+++ b/php_8.3-apache/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-bookworm/Dockerfile b/php_8.3-bookworm/Dockerfile
index c4586e7..586735a 100644
--- a/php_8.3-bookworm/Dockerfile
+++ b/php_8.3-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-fpm-alpine/Dockerfile b/php_8.3-fpm-alpine/Dockerfile
index f8506fd..ead6859 100644
--- a/php_8.3-fpm-alpine/Dockerfile
+++ b/php_8.3-fpm-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.3-fpm-alpine3.22/Dockerfile b/php_8.3-fpm-alpine3.22/Dockerfile
index 9ebe528..00ef2d3 100644
--- a/php_8.3-fpm-alpine3.22/Dockerfile
+++ b/php_8.3-fpm-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.3-fpm-bookworm/Dockerfile b/php_8.3-fpm-bookworm/Dockerfile
index 9325ac7..aa5f839 100644
--- a/php_8.3-fpm-bookworm/Dockerfile
+++ b/php_8.3-fpm-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.3-fpm/Dockerfile b/php_8.3-fpm/Dockerfile
index 74fb7de..89be9f6 100644
--- a/php_8.3-fpm/Dockerfile
+++ b/php_8.3-fpm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.3-rc-alpine/Dockerfile b/php_8.3-rc-alpine/Dockerfile
index c1837f8..b24781e 100644
--- a/php_8.3-rc-alpine/Dockerfile
+++ b/php_8.3-rc-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-rc-alpine3.22/Dockerfile b/php_8.3-rc-alpine3.22/Dockerfile
index ef74ce4..a1e1e60 100644
--- a/php_8.3-rc-alpine3.22/Dockerfile
+++ b/php_8.3-rc-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-rc-apache-bookworm/Dockerfile b/php_8.3-rc-apache-bookworm/Dockerfile
index 8255818..dfb9513 100644
--- a/php_8.3-rc-apache-bookworm/Dockerfile
+++ b/php_8.3-rc-apache-bookworm/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-rc-apache/Dockerfile b/php_8.3-rc-apache/Dockerfile
index 951f6a4..6b570ca 100644
--- a/php_8.3-rc-apache/Dockerfile
+++ b/php_8.3-rc-apache/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-rc-bookworm/Dockerfile b/php_8.3-rc-bookworm/Dockerfile
index 6663819..f41d929 100644
--- a/php_8.3-rc-bookworm/Dockerfile
+++ b/php_8.3-rc-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-rc-fpm-alpine/Dockerfile b/php_8.3-rc-fpm-alpine/Dockerfile
index 7a2fee3..46c1e43 100644
--- a/php_8.3-rc-fpm-alpine/Dockerfile
+++ b/php_8.3-rc-fpm-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -209,20 +211,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -238,13 +236,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.3-rc-fpm-alpine3.22/Dockerfile b/php_8.3-rc-fpm-alpine3.22/Dockerfile
index 0cef100..0c5faed 100644
--- a/php_8.3-rc-fpm-alpine3.22/Dockerfile
+++ b/php_8.3-rc-fpm-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -209,20 +211,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -238,13 +236,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.3-rc-fpm-bookworm/Dockerfile b/php_8.3-rc-fpm-bookworm/Dockerfile
index 9825667..c5be07f 100644
--- a/php_8.3-rc-fpm-bookworm/Dockerfile
+++ b/php_8.3-rc-fpm-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -226,20 +228,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -255,13 +253,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.3-rc-fpm/Dockerfile b/php_8.3-rc-fpm/Dockerfile
index 40f73c5..38993c6 100644
--- a/php_8.3-rc-fpm/Dockerfile
+++ b/php_8.3-rc-fpm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -226,20 +228,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -255,13 +253,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.3-rc-zts-alpine/Dockerfile b/php_8.3-rc-zts-alpine/Dockerfile
index a720651..812d2f0 100644
--- a/php_8.3-rc-zts-alpine/Dockerfile
+++ b/php_8.3-rc-zts-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-rc-zts-alpine3.22/Dockerfile b/php_8.3-rc-zts-alpine3.22/Dockerfile
index 006f9fd..60d8322 100644
--- a/php_8.3-rc-zts-alpine3.22/Dockerfile
+++ b/php_8.3-rc-zts-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-rc-zts-bookworm/Dockerfile b/php_8.3-rc-zts-bookworm/Dockerfile
index 3d5b622..bfdd5d0 100644
--- a/php_8.3-rc-zts-bookworm/Dockerfile
+++ b/php_8.3-rc-zts-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-rc-zts/Dockerfile b/php_8.3-rc-zts/Dockerfile
index 80900a1..e40cac1 100644
--- a/php_8.3-rc-zts/Dockerfile
+++ b/php_8.3-rc-zts/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-rc/Dockerfile b/php_8.3-rc/Dockerfile
index 63d2f41..bfe3c80 100644
--- a/php_8.3-rc/Dockerfile
+++ b/php_8.3-rc/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-zts-alpine/Dockerfile b/php_8.3-zts-alpine/Dockerfile
index dd71ce4..a7fe98b 100644
--- a/php_8.3-zts-alpine/Dockerfile
+++ b/php_8.3-zts-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-zts-alpine3.22/Dockerfile b/php_8.3-zts-alpine3.22/Dockerfile
index 2f08aa4..5e10dc1 100644
--- a/php_8.3-zts-alpine3.22/Dockerfile
+++ b/php_8.3-zts-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-zts-bookworm/Dockerfile b/php_8.3-zts-bookworm/Dockerfile
index 97a5a02..5368998 100644
--- a/php_8.3-zts-bookworm/Dockerfile
+++ b/php_8.3-zts-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3-zts/Dockerfile b/php_8.3-zts/Dockerfile
index 92c721e..5d0dbe3 100644
--- a/php_8.3-zts/Dockerfile
+++ b/php_8.3-zts/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.3/Dockerfile b/php_8.3/Dockerfile
index 80a36a1..d969ccd 100644
--- a/php_8.3/Dockerfile
+++ b/php_8.3/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-alpine/Dockerfile b/php_8.4-alpine/Dockerfile
index 46d5f42..5386cef 100644
--- a/php_8.4-alpine/Dockerfile
+++ b/php_8.4-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-alpine3.22/Dockerfile b/php_8.4-alpine3.22/Dockerfile
index 79bcb02..3bb5b5a 100644
--- a/php_8.4-alpine3.22/Dockerfile
+++ b/php_8.4-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-apache-bookworm/Dockerfile b/php_8.4-apache-bookworm/Dockerfile
index 2e0afd7..0cb322d 100644
--- a/php_8.4-apache-bookworm/Dockerfile
+++ b/php_8.4-apache-bookworm/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-apache/Dockerfile b/php_8.4-apache/Dockerfile
index d6af20a..59a90aa 100644
--- a/php_8.4-apache/Dockerfile
+++ b/php_8.4-apache/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-bookworm/Dockerfile b/php_8.4-bookworm/Dockerfile
index 2c17e44..0089ce9 100644
--- a/php_8.4-bookworm/Dockerfile
+++ b/php_8.4-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-fpm-alpine/Dockerfile b/php_8.4-fpm-alpine/Dockerfile
index 598fc0c..2e93000 100644
--- a/php_8.4-fpm-alpine/Dockerfile
+++ b/php_8.4-fpm-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.4-fpm-alpine3.22/Dockerfile b/php_8.4-fpm-alpine3.22/Dockerfile
index 64719f5..f509d5e 100644
--- a/php_8.4-fpm-alpine3.22/Dockerfile
+++ b/php_8.4-fpm-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -209,20 +211,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.4-fpm-bookworm/Dockerfile b/php_8.4-fpm-bookworm/Dockerfile
index e5a1f46..0b1547f 100644
--- a/php_8.4-fpm-bookworm/Dockerfile
+++ b/php_8.4-fpm-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.4-fpm/Dockerfile b/php_8.4-fpm/Dockerfile
index 31c5a5f..383e780 100644
--- a/php_8.4-fpm/Dockerfile
+++ b/php_8.4-fpm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -226,20 +228,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_8.4-rc-alpine/Dockerfile b/php_8.4-rc-alpine/Dockerfile
index 3c96c70..c52452b 100644
--- a/php_8.4-rc-alpine/Dockerfile
+++ b/php_8.4-rc-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-rc-alpine3.22/Dockerfile b/php_8.4-rc-alpine3.22/Dockerfile
index cc047d9..e2d4639 100644
--- a/php_8.4-rc-alpine3.22/Dockerfile
+++ b/php_8.4-rc-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-rc-apache-bookworm/Dockerfile b/php_8.4-rc-apache-bookworm/Dockerfile
index 3b1c615..6598e07 100644
--- a/php_8.4-rc-apache-bookworm/Dockerfile
+++ b/php_8.4-rc-apache-bookworm/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-rc-apache/Dockerfile b/php_8.4-rc-apache/Dockerfile
index 01e69e6..09c97ff 100644
--- a/php_8.4-rc-apache/Dockerfile
+++ b/php_8.4-rc-apache/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-rc-bookworm/Dockerfile b/php_8.4-rc-bookworm/Dockerfile
index a995cd3..aca8f11 100644
--- a/php_8.4-rc-bookworm/Dockerfile
+++ b/php_8.4-rc-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-rc-fpm-alpine/Dockerfile b/php_8.4-rc-fpm-alpine/Dockerfile
index 471be77..4b89fa6 100644
--- a/php_8.4-rc-fpm-alpine/Dockerfile
+++ b/php_8.4-rc-fpm-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -209,20 +211,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -238,13 +236,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.4-rc-fpm-alpine3.22/Dockerfile b/php_8.4-rc-fpm-alpine3.22/Dockerfile
index 9cd71ac..9ad29e6 100644
--- a/php_8.4-rc-fpm-alpine3.22/Dockerfile
+++ b/php_8.4-rc-fpm-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -209,20 +211,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -238,13 +236,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.4-rc-fpm-bookworm/Dockerfile b/php_8.4-rc-fpm-bookworm/Dockerfile
index bea1341..791881a 100644
--- a/php_8.4-rc-fpm-bookworm/Dockerfile
+++ b/php_8.4-rc-fpm-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -226,20 +228,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -255,13 +253,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.4-rc-fpm/Dockerfile b/php_8.4-rc-fpm/Dockerfile
index 6e842c0..e5c1871 100644
--- a/php_8.4-rc-fpm/Dockerfile
+++ b/php_8.4-rc-fpm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -226,20 +228,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -255,13 +253,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.4-rc-zts-alpine/Dockerfile b/php_8.4-rc-zts-alpine/Dockerfile
index 277eaac..dbee141 100644
--- a/php_8.4-rc-zts-alpine/Dockerfile
+++ b/php_8.4-rc-zts-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-rc-zts-alpine3.22/Dockerfile b/php_8.4-rc-zts-alpine3.22/Dockerfile
index b66b9fa..a612b26 100644
--- a/php_8.4-rc-zts-alpine3.22/Dockerfile
+++ b/php_8.4-rc-zts-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-rc-zts-bookworm/Dockerfile b/php_8.4-rc-zts-bookworm/Dockerfile
index 0b7396b..6100817 100644
--- a/php_8.4-rc-zts-bookworm/Dockerfile
+++ b/php_8.4-rc-zts-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-rc-zts/Dockerfile b/php_8.4-rc-zts/Dockerfile
index a4e8f39..f7a5fa0 100644
--- a/php_8.4-rc-zts/Dockerfile
+++ b/php_8.4-rc-zts/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-rc/Dockerfile b/php_8.4-rc/Dockerfile
index 91c3300..a1992ff 100644
--- a/php_8.4-rc/Dockerfile
+++ b/php_8.4-rc/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-zts-alpine/Dockerfile b/php_8.4-zts-alpine/Dockerfile
index 6b9aaf6..3dac085 100644
--- a/php_8.4-zts-alpine/Dockerfile
+++ b/php_8.4-zts-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-zts-alpine3.22/Dockerfile b/php_8.4-zts-alpine3.22/Dockerfile
index 1857ac1..9fceff7 100644
--- a/php_8.4-zts-alpine3.22/Dockerfile
+++ b/php_8.4-zts-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-zts-bookworm/Dockerfile b/php_8.4-zts-bookworm/Dockerfile
index 4069c02..28f4909 100644
--- a/php_8.4-zts-bookworm/Dockerfile
+++ b/php_8.4-zts-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4-zts/Dockerfile b/php_8.4-zts/Dockerfile
index 22fb97e..6eb5ea7 100644
--- a/php_8.4-zts/Dockerfile
+++ b/php_8.4-zts/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.4/Dockerfile b/php_8.4/Dockerfile
index 9dda442..0ae2069 100644
--- a/php_8.4/Dockerfile
+++ b/php_8.4/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc-alpine/Dockerfile b/php_8.5-rc-alpine/Dockerfile
index 5b838d7..5aadcbe 100644
--- a/php_8.5-rc-alpine/Dockerfile
+++ b/php_8.5-rc-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc-alpine3.22/Dockerfile b/php_8.5-rc-alpine3.22/Dockerfile
index 3c2b498..677717a 100644
--- a/php_8.5-rc-alpine3.22/Dockerfile
+++ b/php_8.5-rc-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc-apache-bookworm/Dockerfile b/php_8.5-rc-apache-bookworm/Dockerfile
index 3e2200d..f04b826 100644
--- a/php_8.5-rc-apache-bookworm/Dockerfile
+++ b/php_8.5-rc-apache-bookworm/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc-apache/Dockerfile b/php_8.5-rc-apache/Dockerfile
index da51a2b..5ae2769 100644
--- a/php_8.5-rc-apache/Dockerfile
+++ b/php_8.5-rc-apache/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc-bookworm/Dockerfile b/php_8.5-rc-bookworm/Dockerfile
index 7e02c40..092238a 100644
--- a/php_8.5-rc-bookworm/Dockerfile
+++ b/php_8.5-rc-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc-fpm-alpine/Dockerfile b/php_8.5-rc-fpm-alpine/Dockerfile
index ae93294..f3348ad 100644
--- a/php_8.5-rc-fpm-alpine/Dockerfile
+++ b/php_8.5-rc-fpm-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -206,20 +208,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -235,13 +233,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.5-rc-fpm-alpine3.22/Dockerfile b/php_8.5-rc-fpm-alpine3.22/Dockerfile
index 2f734f7..efe5f3e 100644
--- a/php_8.5-rc-fpm-alpine3.22/Dockerfile
+++ b/php_8.5-rc-fpm-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -206,20 +208,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -235,13 +233,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.5-rc-fpm-bookworm/Dockerfile b/php_8.5-rc-fpm-bookworm/Dockerfile
index d647134..e37aa2e 100644
--- a/php_8.5-rc-fpm-bookworm/Dockerfile
+++ b/php_8.5-rc-fpm-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -223,20 +225,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -252,13 +250,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.5-rc-fpm/Dockerfile b/php_8.5-rc-fpm/Dockerfile
index 4056963..4c7e13f 100644
--- a/php_8.5-rc-fpm/Dockerfile
+++ b/php_8.5-rc-fpm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -223,20 +225,16 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
+ # comment out localhost-only listen address
+ grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
+ grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
@@ -252,13 +250,13 @@ RUN set -eux; \
echo '; Ensure worker stdout and stderr are sent to the main error log.'; \
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 'listen = 9000'; \
} | tee php-fpm.d/docker.conf; \
{ \
echo '[global]'; \
echo 'daemonize = no'; \
- echo; \
- echo '[www]'; \
- echo 'listen = 9000'; \
} | tee php-fpm.d/zz-docker.conf; \
mkdir -p "$PHP_INI_DIR/conf.d"; \
{ \
diff --git a/php_8.5-rc-zts-alpine/Dockerfile b/php_8.5-rc-zts-alpine/Dockerfile
index 372b1c8..20a6e8a 100644
--- a/php_8.5-rc-zts-alpine/Dockerfile
+++ b/php_8.5-rc-zts-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc-zts-alpine3.22/Dockerfile b/php_8.5-rc-zts-alpine3.22/Dockerfile
index 30147c1..a8eabce 100644
--- a/php_8.5-rc-zts-alpine3.22/Dockerfile
+++ b/php_8.5-rc-zts-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc-zts-bookworm/Dockerfile b/php_8.5-rc-zts-bookworm/Dockerfile
index 40ae126..524b17a 100644
--- a/php_8.5-rc-zts-bookworm/Dockerfile
+++ b/php_8.5-rc-zts-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc-zts/Dockerfile b/php_8.5-rc-zts/Dockerfile
index 1a76224..2478560 100644
--- a/php_8.5-rc-zts/Dockerfile
+++ b/php_8.5-rc-zts/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_8.5-rc/Dockerfile b/php_8.5-rc/Dockerfile
index beb4ed8..718fc14 100644
--- a/php_8.5-rc/Dockerfile
+++ b/php_8.5-rc/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_alpine/Dockerfile b/php_alpine/Dockerfile
index 53d82d0..eae0173 100644
--- a/php_alpine/Dockerfile
+++ b/php_alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_alpine3.22/Dockerfile b/php_alpine3.22/Dockerfile
index ad675ba..83dd753 100644
--- a/php_alpine3.22/Dockerfile
+++ b/php_alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_apache-bookworm/Dockerfile b/php_apache-bookworm/Dockerfile
index 336284e..be03c1e 100644
--- a/php_apache-bookworm/Dockerfile
+++ b/php_apache-bookworm/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_apache/Dockerfile b/php_apache/Dockerfile
index 0db8846..1d31290 100644
--- a/php_apache/Dockerfile
+++ b/php_apache/Dockerfile
@@ -188,8 +188,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_bookworm/Dockerfile b/php_bookworm/Dockerfile
index 9a161d3..fd623a0 100644
--- a/php_bookworm/Dockerfile
+++ b/php_bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine/Dockerfile
index 87efe79..fa1716b 100644
--- a/php_fpm-alpine/Dockerfile
+++ b/php_fpm-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -206,20 +208,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_fpm-alpine3.22/Dockerfile b/php_fpm-alpine3.22/Dockerfile
index d9704c0..787697b 100644
--- a/php_fpm-alpine3.22/Dockerfile
+++ b/php_fpm-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -206,20 +208,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_fpm-bookworm/Dockerfile b/php_fpm-bookworm/Dockerfile
index d4aa304..c3f93fa 100644
--- a/php_fpm-bookworm/Dockerfile
+++ b/php_fpm-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -223,20 +225,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile
index fd28a10..a3bedfa 100644
--- a/php_fpm/Dockerfile
+++ b/php_fpm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
@@ -223,20 +225,11 @@ ENTRYPOINT ["docker-php-entrypoint"]
WORKDIR /var/www/html
RUN set -eux; \
- cd /usr/local/etc; \
- if [ -d php-fpm.d ]; then \
- # for some reason, upstream's php-fpm.conf.default has "include=NONE/etc/php-fpm.d/*.conf"
- sed 's!=NONE/!=!g' php-fpm.conf.default | tee php-fpm.conf > /dev/null; \
- cp php-fpm.d/www.conf.default php-fpm.d/www.conf; \
- else \
- # PHP 5.x doesn't use "include=" by default, so we'll create our own simple config that mimics PHP 7+ for consistency
- mkdir php-fpm.d; \
- cp php-fpm.conf.default php-fpm.d/www.conf; \
- { \
- echo '[global]'; \
- echo 'include=etc/php-fpm.d/*.conf'; \
- } | tee php-fpm.conf; \
- fi; \
+ cd "${PHP_INI_DIR%/php}"; \
+ \
+ cp -v php-fpm.conf.default php-fpm.conf; \
+ cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
+ \
{ \
echo '[global]'; \
echo 'error_log = /proc/self/fd/2'; \
diff --git a/php_latest/Dockerfile b/php_latest/Dockerfile
index acbea6f..4dd366f 100644
--- a/php_latest/Dockerfile
+++ b/php_latest/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine/Dockerfile
index 88bb35f..e7c0d52 100644
--- a/php_zts-alpine/Dockerfile
+++ b/php_zts-alpine/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_zts-alpine3.22/Dockerfile b/php_zts-alpine3.22/Dockerfile
index 516d3ff..58ccd4f 100644
--- a/php_zts-alpine3.22/Dockerfile
+++ b/php_zts-alpine3.22/Dockerfile
@@ -116,8 +116,10 @@ RUN set -eux; \
docker-php-source extract; \
cd /usr/src/php; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_zts-bookworm/Dockerfile b/php_zts-bookworm/Dockerfile
index c6ead29..bff7ff1 100644
--- a/php_zts-bookworm/Dockerfile
+++ b/php_zts-bookworm/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\
diff --git a/php_zts/Dockerfile b/php_zts/Dockerfile
index c6a653c..aae5ded 100644
--- a/php_zts/Dockerfile
+++ b/php_zts/Dockerfile
@@ -127,8 +127,10 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
+ test "$PHP_INI_DIR" != "${PHP_INI_DIR%/php}"; \
./configure \
--build="$gnuArch" \
+ --sysconfdir="${PHP_INI_DIR%/php}" \
--with-config-file-path="$PHP_INI_DIR" \
--with-config-file-scan-dir="$PHP_INI_DIR/conf.d" \
\Relevant Maintainers: |
tianon
approved these changes
Jan 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes:
sysconfdirexplicitly during build (Setsysconfdirexplicitly during build php#1636)variantscalculation intojq(Movevariantscalculation intojqphp#1640)