From f8c3dc9ad98b95492aa871f256d6ac223bb49087 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 8 Dec 2023 16:45:18 -0800 Subject: [PATCH] Fix permissions on $APACHE_RUN_DIR/socks in Debian Bookworm+ See https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 --- 8.1-rc/bookworm/apache/Dockerfile | 2 ++ 8.1/bookworm/apache/Dockerfile | 2 ++ 8.2-rc/bookworm/apache/Dockerfile | 2 ++ 8.2/bookworm/apache/Dockerfile | 2 ++ 8.3-rc/bookworm/apache/Dockerfile | 2 ++ 8.3/bookworm/apache/Dockerfile | 2 ++ Dockerfile-linux.template | 4 ++++ 7 files changed, 16 insertions(+) diff --git a/8.1-rc/bookworm/apache/Dockerfile b/8.1-rc/bookworm/apache/Dockerfile index 1c77955a3..9e63c326f 100644 --- a/8.1-rc/bookworm/apache/Dockerfile +++ b/8.1-rc/bookworm/apache/Dockerfile @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ diff --git a/8.1/bookworm/apache/Dockerfile b/8.1/bookworm/apache/Dockerfile index ec0068444..315159862 100644 --- a/8.1/bookworm/apache/Dockerfile +++ b/8.1/bookworm/apache/Dockerfile @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ diff --git a/8.2-rc/bookworm/apache/Dockerfile b/8.2-rc/bookworm/apache/Dockerfile index 2ff695563..cfc7d1ed5 100644 --- a/8.2-rc/bookworm/apache/Dockerfile +++ b/8.2-rc/bookworm/apache/Dockerfile @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ diff --git a/8.2/bookworm/apache/Dockerfile b/8.2/bookworm/apache/Dockerfile index 790e77d76..588626cce 100644 --- a/8.2/bookworm/apache/Dockerfile +++ b/8.2/bookworm/apache/Dockerfile @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ diff --git a/8.3-rc/bookworm/apache/Dockerfile b/8.3-rc/bookworm/apache/Dockerfile index be61cd443..882f4739b 100644 --- a/8.3-rc/bookworm/apache/Dockerfile +++ b/8.3-rc/bookworm/apache/Dockerfile @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ diff --git a/8.3/bookworm/apache/Dockerfile b/8.3/bookworm/apache/Dockerfile index 7e423c6a3..7f2c39e44 100644 --- a/8.3/bookworm/apache/Dockerfile +++ b/8.3/bookworm/apache/Dockerfile @@ -70,6 +70,8 @@ RUN set -eux; \ "$APACHE_LOCK_DIR" \ "$APACHE_RUN_DIR" \ "$APACHE_LOG_DIR" \ +# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 + "$APACHE_RUN_DIR/socks" \ ; do \ rm -rvf "$dir"; \ mkdir -p "$dir"; \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index dbc3080fe..752b3ef6a 100644 --- 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"; \