From 0ea87f3ee87fff6c7550763710ea2693c22f3966 Mon Sep 17 00:00:00 2001 From: Felipe Zipitria Date: Wed, 17 Nov 2021 09:03:54 -0300 Subject: [PATCH] fix(user): propagate www-data user check into alpine build Signed-off-by: Felipe Zipitria --- 2.4/alpine/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 2256bc3..512076c 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -203,11 +203,13 @@ RUN set -eux; \ -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \ -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \ -e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \ - -e 's!^User daemon!User www-data!g' \ - -e 's!^Group daemon!Group www-data!g' \ + -e 's!^(\s*User)\s+daemon\s*$!\1 www-data!g' \ + -e 's!^(\s*Group)\s+daemon\s*$!\1 www-data!g' \ "$HTTPD_PREFIX/conf/httpd.conf" \ "$HTTPD_PREFIX/conf/extra/httpd-ssl.conf" \ ; \ + grep -E '^\s*User www-data$' "$HTTPD_PREFIX/conf/httpd.conf"; \ + grep -E '^\s*Group www-data$' "$HTTPD_PREFIX/conf/httpd.conf"; \ \ deps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \