Merge pull request #1473 from infosiftr/socks

Fix permissions on $APACHE_RUN_DIR/socks in Debian Bookworm+
docker-library · Dec 11, 2023 · 95a8817 · 95a8817
2 parents 1375ac8 + f8c3dc9
commit 95a8817
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 0 deletions.
diff --git a/8.1-rc/bookworm/apache/Dockerfile b/8.1-rc/bookworm/apache/Dockerfile
diff --git a/8.1/bookworm/apache/Dockerfile b/8.1/bookworm/apache/Dockerfile
diff --git a/8.2-rc/bookworm/apache/Dockerfile b/8.2-rc/bookworm/apache/Dockerfile
diff --git a/8.2/bookworm/apache/Dockerfile b/8.2/bookworm/apache/Dockerfile
diff --git a/8.3-rc/bookworm/apache/Dockerfile b/8.3-rc/bookworm/apache/Dockerfile
diff --git a/8.3/bookworm/apache/Dockerfile b/8.3/bookworm/apache/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -103,6 +103,10 @@ RUN set -eux; \
 		"$APACHE_LOCK_DIR" \
 		"$APACHE_RUN_DIR" \
 		"$APACHE_LOG_DIR" \
+{{ if [ "bullseye" ] | index(env.suite) then "" else ( -}}
+# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205
+		"$APACHE_RUN_DIR/socks" \
+{{ ) end -}}
 	; do \
 		rm -rvf "$dir"; \
 		mkdir -p "$dir"; \