Skip to content

Commit 95a8817

Browse files
Merge pull request #1473 from infosiftr/socks
Fix permissions on $APACHE_RUN_DIR/socks in Debian Bookworm+
2 parents 1375ac8 + f8c3dc9 commit 95a8817

File tree

7 files changed

+16
-0
lines changed

7 files changed

+16
-0
lines changed

8.1-rc/bookworm/apache/Dockerfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.1/bookworm/apache/Dockerfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.2-rc/bookworm/apache/Dockerfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.2/bookworm/apache/Dockerfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.3-rc/bookworm/apache/Dockerfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.3/bookworm/apache/Dockerfile

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-linux.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ RUN set -eux; \
103103
"$APACHE_LOCK_DIR" \
104104
"$APACHE_RUN_DIR" \
105105
"$APACHE_LOG_DIR" \
106+
{{ if [ "bullseye" ] | index(env.suite) then "" else ( -}}
107+
# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205
108+
"$APACHE_RUN_DIR/socks" \
109+
{{ ) end -}}
106110
; do \
107111
rm -rvf "$dir"; \
108112
mkdir -p "$dir"; \

0 commit comments

Comments
 (0)