Skip to content

Conversation

@yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/php@3dc95984: Merge pull request docker-library/php#1383 from infosiftr/1777
- docker-library/php@10f96dc6: Update permissions from 777 to 1777
@github-actions
Copy link

Diff for 3ad4f56:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9340ef5..eabf56c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,195 +3,195 @@ GitRepo: https://github.com/docker-library/php.git
 
 Tags: 8.0.28-apache-bullseye, 8.0-apache-bullseye, 8.0.28-apache, 8.0-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 03dcf3bd0cf7d08869b53e48245086e8961f6b76
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/bullseye/apache
 
 Tags: 8.0.28-apache-buster, 8.0-apache-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 03dcf3bd0cf7d08869b53e48245086e8961f6b76
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/buster/apache
 
 Tags: 8.0.28-cli-alpine3.16, 8.0-cli-alpine3.16, 8.0.28-alpine3.16, 8.0-alpine3.16, 8.0.28-cli-alpine, 8.0-cli-alpine, 8.0.28-alpine, 8.0-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 03dcf3bd0cf7d08869b53e48245086e8961f6b76
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/alpine3.16/cli
 
 Tags: 8.0.28-cli-bullseye, 8.0-cli-bullseye, 8.0.28-bullseye, 8.0-bullseye, 8.0.28-cli, 8.0-cli, 8.0.28, 8.0
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 03dcf3bd0cf7d08869b53e48245086e8961f6b76
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/bullseye/cli
 
 Tags: 8.0.28-cli-buster, 8.0-cli-buster, 8.0.28-buster, 8.0-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 03dcf3bd0cf7d08869b53e48245086e8961f6b76
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/buster/cli
 
 Tags: 8.0.28-fpm-alpine3.16, 8.0-fpm-alpine3.16, 8.0.28-fpm-alpine, 8.0-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: eb33eee2833242f9f67827e881a8ad0432503292
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/alpine3.16/fpm
 
 Tags: 8.0.28-fpm-bullseye, 8.0-fpm-bullseye, 8.0.28-fpm, 8.0-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: eb33eee2833242f9f67827e881a8ad0432503292
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/bullseye/fpm
 
 Tags: 8.0.28-fpm-buster, 8.0-fpm-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: eb33eee2833242f9f67827e881a8ad0432503292
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/buster/fpm
 
 Tags: 8.0.28-zts-alpine3.16, 8.0-zts-alpine3.16, 8.0.28-zts-alpine, 8.0-zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 03dcf3bd0cf7d08869b53e48245086e8961f6b76
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/alpine3.16/zts
 
 Tags: 8.0.28-zts-bullseye, 8.0-zts-bullseye, 8.0.28-zts, 8.0-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 03dcf3bd0cf7d08869b53e48245086e8961f6b76
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/bullseye/zts
 
 Tags: 8.0.28-zts-buster, 8.0-zts-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 03dcf3bd0cf7d08869b53e48245086e8961f6b76
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.0/buster/zts
 
 Tags: 8.1.17-apache-bullseye, 8.1-apache-bullseye, 8.1.17-apache, 8.1-apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/bullseye/apache
 
 Tags: 8.1.17-apache-buster, 8.1-apache-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/buster/apache
 
 Tags: 8.1.17-cli-alpine3.16, 8.1-cli-alpine3.16, 8.1.17-alpine3.16, 8.1-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/alpine3.16/cli
 
 Tags: 8.1.17-cli-alpine3.17, 8.1-cli-alpine3.17, 8.1.17-alpine3.17, 8.1-alpine3.17, 8.1.17-cli-alpine, 8.1-cli-alpine, 8.1.17-alpine, 8.1-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/alpine3.17/cli
 
 Tags: 8.1.17-cli-bullseye, 8.1-cli-bullseye, 8.1.17-bullseye, 8.1-bullseye, 8.1.17-cli, 8.1-cli, 8.1.17, 8.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/bullseye/cli
 
 Tags: 8.1.17-cli-buster, 8.1-cli-buster, 8.1.17-buster, 8.1-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/buster/cli
 
 Tags: 8.1.17-fpm-alpine3.16, 8.1-fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/alpine3.16/fpm
 
 Tags: 8.1.17-fpm-alpine3.17, 8.1-fpm-alpine3.17, 8.1.17-fpm-alpine, 8.1-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/alpine3.17/fpm
 
 Tags: 8.1.17-fpm-bullseye, 8.1-fpm-bullseye, 8.1.17-fpm, 8.1-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/bullseye/fpm
 
 Tags: 8.1.17-fpm-buster, 8.1-fpm-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/buster/fpm
 
 Tags: 8.1.17-zts-alpine3.16, 8.1-zts-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/alpine3.16/zts
 
 Tags: 8.1.17-zts-alpine3.17, 8.1-zts-alpine3.17, 8.1.17-zts-alpine, 8.1-zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/alpine3.17/zts
 
 Tags: 8.1.17-zts-bullseye, 8.1-zts-bullseye, 8.1.17-zts, 8.1-zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/bullseye/zts
 
 Tags: 8.1.17-zts-buster, 8.1-zts-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: f56a765506946dec5f75394244008e8a89c8d557
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.1/buster/zts
 
 Tags: 8.2.4-apache-bullseye, 8.2-apache-bullseye, 8-apache-bullseye, apache-bullseye, 8.2.4-apache, 8.2-apache, 8-apache, apache
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/bullseye/apache
 
 Tags: 8.2.4-apache-buster, 8.2-apache-buster, 8-apache-buster, apache-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/buster/apache
 
 Tags: 8.2.4-cli-alpine3.16, 8.2-cli-alpine3.16, 8-cli-alpine3.16, cli-alpine3.16, 8.2.4-alpine3.16, 8.2-alpine3.16, 8-alpine3.16, alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/alpine3.16/cli
 
 Tags: 8.2.4-cli-alpine3.17, 8.2-cli-alpine3.17, 8-cli-alpine3.17, cli-alpine3.17, 8.2.4-alpine3.17, 8.2-alpine3.17, 8-alpine3.17, alpine3.17, 8.2.4-cli-alpine, 8.2-cli-alpine, 8-cli-alpine, cli-alpine, 8.2.4-alpine, 8.2-alpine, 8-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/alpine3.17/cli
 
 Tags: 8.2.4-cli-bullseye, 8.2-cli-bullseye, 8-cli-bullseye, cli-bullseye, 8.2.4-bullseye, 8.2-bullseye, 8-bullseye, bullseye, 8.2.4-cli, 8.2-cli, 8-cli, cli, 8.2.4, 8.2, 8, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/bullseye/cli
 
 Tags: 8.2.4-cli-buster, 8.2-cli-buster, 8-cli-buster, cli-buster, 8.2.4-buster, 8.2-buster, 8-buster, buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/buster/cli
 
 Tags: 8.2.4-fpm-alpine3.16, 8.2-fpm-alpine3.16, 8-fpm-alpine3.16, fpm-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/alpine3.16/fpm
 
 Tags: 8.2.4-fpm-alpine3.17, 8.2-fpm-alpine3.17, 8-fpm-alpine3.17, fpm-alpine3.17, 8.2.4-fpm-alpine, 8.2-fpm-alpine, 8-fpm-alpine, fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/alpine3.17/fpm
 
 Tags: 8.2.4-fpm-bullseye, 8.2-fpm-bullseye, 8-fpm-bullseye, fpm-bullseye, 8.2.4-fpm, 8.2-fpm, 8-fpm, fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/bullseye/fpm
 
 Tags: 8.2.4-fpm-buster, 8.2-fpm-buster, 8-fpm-buster, fpm-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/buster/fpm
 
 Tags: 8.2.4-zts-alpine3.16, 8.2-zts-alpine3.16, 8-zts-alpine3.16, zts-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/alpine3.16/zts
 
 Tags: 8.2.4-zts-alpine3.17, 8.2-zts-alpine3.17, 8-zts-alpine3.17, zts-alpine3.17, 8.2.4-zts-alpine, 8.2-zts-alpine, 8-zts-alpine, zts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/alpine3.17/zts
 
 Tags: 8.2.4-zts-bullseye, 8.2-zts-bullseye, 8-zts-bullseye, zts-bullseye, 8.2.4-zts, 8.2-zts, 8-zts, zts
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/bullseye/zts
 
 Tags: 8.2.4-zts-buster, 8.2-zts-buster, 8-zts-buster, zts-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b486922583642fbe609b8153379ae2ce0256df51
+GitCommit: 10f96dc6d91e399792bdd2cd989e2b326f68a29f
 Directory: 8.2/buster/zts
diff --git a/php_8.0-alpine/Dockerfile b/php_8.0-alpine/Dockerfile
index 467b68c..701e433 100644
--- a/php_8.0-alpine/Dockerfile
+++ b/php_8.0-alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.0-apache-buster/Dockerfile b/php_8.0-apache-buster/Dockerfile
index 20d98ea..ca81e8f 100644
--- a/php_8.0-apache-buster/Dockerfile
+++ b/php_8.0-apache-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
@@ -75,7 +75,7 @@ RUN set -eux; \
 		mkdir -p "$dir"; \
 		chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \
 # allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
-		chmod 777 "$dir"; \
+		chmod 1777 "$dir"; \
 	done; \
 	\
 # delete the "index.html" that installing Apache drops in here
diff --git a/php_8.0-apache/Dockerfile b/php_8.0-apache/Dockerfile
index 788741a..c60632e 100644
--- a/php_8.0-apache/Dockerfile
+++ b/php_8.0-apache/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
@@ -75,7 +75,7 @@ RUN set -eux; \
 		mkdir -p "$dir"; \
 		chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \
 # allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
-		chmod 777 "$dir"; \
+		chmod 1777 "$dir"; \
 	done; \
 	\
 # delete the "index.html" that installing Apache drops in here
diff --git a/php_8.0-buster/Dockerfile b/php_8.0-buster/Dockerfile
index 1ab399e..608c352 100644
--- a/php_8.0-buster/Dockerfile
+++ b/php_8.0-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.0-fpm-alpine/Dockerfile b/php_8.0-fpm-alpine/Dockerfile
index c0b51e2..daa269b 100644
--- a/php_8.0-fpm-alpine/Dockerfile
+++ b/php_8.0-fpm-alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.0-fpm-buster/Dockerfile b/php_8.0-fpm-buster/Dockerfile
index 55bfd05..4c3ff12 100644
--- a/php_8.0-fpm-buster/Dockerfile
+++ b/php_8.0-fpm-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.0-fpm/Dockerfile b/php_8.0-fpm/Dockerfile
index 4cf5450..810c6ad 100644
--- a/php_8.0-fpm/Dockerfile
+++ b/php_8.0-fpm/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.0-zts-alpine/Dockerfile b/php_8.0-zts-alpine/Dockerfile
index a16040b..77df747 100644
--- a/php_8.0-zts-alpine/Dockerfile
+++ b/php_8.0-zts-alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.0-zts-buster/Dockerfile b/php_8.0-zts-buster/Dockerfile
index d1b2643..e291617 100644
--- a/php_8.0-zts-buster/Dockerfile
+++ b/php_8.0-zts-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.0-zts/Dockerfile b/php_8.0-zts/Dockerfile
index 6b82aaa..ec4b0cb 100644
--- a/php_8.0-zts/Dockerfile
+++ b/php_8.0-zts/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.0/Dockerfile b/php_8.0/Dockerfile
index 5d077b9..de8270b 100644
--- a/php_8.0/Dockerfile
+++ b/php_8.0/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-alpine/Dockerfile b/php_8.1-alpine/Dockerfile
index 1ce7815..bf01808 100644
--- a/php_8.1-alpine/Dockerfile
+++ b/php_8.1-alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-alpine3.16/Dockerfile b/php_8.1-alpine3.16/Dockerfile
index 9de4393..3b239e2 100644
--- a/php_8.1-alpine3.16/Dockerfile
+++ b/php_8.1-alpine3.16/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-apache-buster/Dockerfile b/php_8.1-apache-buster/Dockerfile
index 5801b08..b371a16 100644
--- a/php_8.1-apache-buster/Dockerfile
+++ b/php_8.1-apache-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
@@ -75,7 +75,7 @@ RUN set -eux; \
 		mkdir -p "$dir"; \
 		chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \
 # allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
-		chmod 777 "$dir"; \
+		chmod 1777 "$dir"; \
 	done; \
 	\
 # delete the "index.html" that installing Apache drops in here
diff --git a/php_8.1-apache/Dockerfile b/php_8.1-apache/Dockerfile
index 9c78811..9b96c5f 100644
--- a/php_8.1-apache/Dockerfile
+++ b/php_8.1-apache/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
@@ -75,7 +75,7 @@ RUN set -eux; \
 		mkdir -p "$dir"; \
 		chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \
 # allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
-		chmod 777 "$dir"; \
+		chmod 1777 "$dir"; \
 	done; \
 	\
 # delete the "index.html" that installing Apache drops in here
diff --git a/php_8.1-buster/Dockerfile b/php_8.1-buster/Dockerfile
index 0d2ba24..7fcd7ff 100644
--- a/php_8.1-buster/Dockerfile
+++ b/php_8.1-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-fpm-alpine/Dockerfile b/php_8.1-fpm-alpine/Dockerfile
index 2e34023..d83253f 100644
--- a/php_8.1-fpm-alpine/Dockerfile
+++ b/php_8.1-fpm-alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-fpm-alpine3.16/Dockerfile b/php_8.1-fpm-alpine3.16/Dockerfile
index febcc2f..4ee33ee 100644
--- a/php_8.1-fpm-alpine3.16/Dockerfile
+++ b/php_8.1-fpm-alpine3.16/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-fpm-buster/Dockerfile b/php_8.1-fpm-buster/Dockerfile
index eb022b0..1fe7903 100644
--- a/php_8.1-fpm-buster/Dockerfile
+++ b/php_8.1-fpm-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-fpm/Dockerfile b/php_8.1-fpm/Dockerfile
index 3f4965f..0328d2f 100644
--- a/php_8.1-fpm/Dockerfile
+++ b/php_8.1-fpm/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-zts-alpine/Dockerfile b/php_8.1-zts-alpine/Dockerfile
index 47014d8..f59e6b6 100644
--- a/php_8.1-zts-alpine/Dockerfile
+++ b/php_8.1-zts-alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-zts-alpine3.16/Dockerfile b/php_8.1-zts-alpine3.16/Dockerfile
index 6225c09..a803054 100644
--- a/php_8.1-zts-alpine3.16/Dockerfile
+++ b/php_8.1-zts-alpine3.16/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-zts-buster/Dockerfile b/php_8.1-zts-buster/Dockerfile
index 58ecd67..44fb2a2 100644
--- a/php_8.1-zts-buster/Dockerfile
+++ b/php_8.1-zts-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1-zts/Dockerfile b/php_8.1-zts/Dockerfile
index 79b36b6..9893f1f 100644
--- a/php_8.1-zts/Dockerfile
+++ b/php_8.1-zts/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_8.1/Dockerfile b/php_8.1/Dockerfile
index 3df8d4e..2f2bc16 100644
--- a/php_8.1/Dockerfile
+++ b/php_8.1/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_alpine/Dockerfile b/php_alpine/Dockerfile
index bc1f24f..bdbf560 100644
--- a/php_alpine/Dockerfile
+++ b/php_alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_alpine3.16/Dockerfile b/php_alpine3.16/Dockerfile
index ff0e683..45c88d9 100644
--- a/php_alpine3.16/Dockerfile
+++ b/php_alpine3.16/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_apache-buster/Dockerfile b/php_apache-buster/Dockerfile
index 931f7b8..5a097f2 100644
--- a/php_apache-buster/Dockerfile
+++ b/php_apache-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
@@ -75,7 +75,7 @@ RUN set -eux; \
 		mkdir -p "$dir"; \
 		chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \
 # allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
-		chmod 777 "$dir"; \
+		chmod 1777 "$dir"; \
 	done; \
 	\
 # delete the "index.html" that installing Apache drops in here
diff --git a/php_apache/Dockerfile b/php_apache/Dockerfile
index 40599e4..b70b525 100644
--- a/php_apache/Dockerfile
+++ b/php_apache/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 ENV APACHE_CONFDIR /etc/apache2
 ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
@@ -75,7 +75,7 @@ RUN set -eux; \
 		mkdir -p "$dir"; \
 		chown "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$dir"; \
 # allow running as an arbitrary user (https://github.com/docker-library/php/issues/743)
-		chmod 777 "$dir"; \
+		chmod 1777 "$dir"; \
 	done; \
 	\
 # delete the "index.html" that installing Apache drops in here
diff --git a/php_buster/Dockerfile b/php_buster/Dockerfile
index a7c652b..e527525 100644
--- a/php_buster/Dockerfile
+++ b/php_buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine/Dockerfile
index 55063bf..71ee4c0 100644
--- a/php_fpm-alpine/Dockerfile
+++ b/php_fpm-alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_fpm-alpine3.16/Dockerfile b/php_fpm-alpine3.16/Dockerfile
index d74c561..a7b9c9b 100644
--- a/php_fpm-alpine3.16/Dockerfile
+++ b/php_fpm-alpine3.16/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_fpm-buster/Dockerfile b/php_fpm-buster/Dockerfile
index 1c5c8a6..b176b22 100644
--- a/php_fpm-buster/Dockerfile
+++ b/php_fpm-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile
index 1b3d7a8..7a3f76d 100644
--- a/php_fpm/Dockerfile
+++ b/php_fpm/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_latest/Dockerfile b/php_latest/Dockerfile
index ac1a184..112c26a 100644
--- a/php_latest/Dockerfile
+++ b/php_latest/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine/Dockerfile
index dfdf9ce..fa7c5cc 100644
--- a/php_zts-alpine/Dockerfile
+++ b/php_zts-alpine/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_zts-alpine3.16/Dockerfile b/php_zts-alpine3.16/Dockerfile
index cccbe25..57aca2c 100644
--- a/php_zts-alpine3.16/Dockerfile
+++ b/php_zts-alpine3.16/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_zts-buster/Dockerfile b/php_zts-buster/Dockerfile
index cc64eb1..d6154de 100644
--- a/php_zts-buster/Dockerfile
+++ b/php_zts-buster/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)
diff --git a/php_zts/Dockerfile b/php_zts/Dockerfile
index 2ae527e..1eb6723 100644
--- a/php_zts/Dockerfile
+++ b/php_zts/Dockerfile
@@ -46,7 +46,7 @@ RUN set -eux; \
 	[ ! -d /var/www/html ]; \
 	mkdir -p /var/www/html; \
 	chown www-data:www-data /var/www/html; \
-	chmod 777 /var/www/html
+	chmod 1777 /var/www/html
 
 # Apply stack smash protection to functions using local buffers and alloca()
 # Make PHP's main executable position-independent (improves ASLR security mechanism, and has no performance impact on x86_64)

Relevant Maintainers:

@tianon tianon merged commit 9ce4f40 into docker-library:master Mar 27, 2023
@tianon tianon deleted the php branch March 27, 2023 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants