Update 2.4/Dockerfile
Co-authored-by: Tianon Gravi <admwiggin@gmail.com>
This commit is contained in:
parent
af35e5cc82
commit
cd9f3170df
|
|
@ -203,11 +203,13 @@ RUN set -eux; \
|
||||||
-e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
|
-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*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
|
||||||
-e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \
|
-e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \
|
||||||
-e 's!^User daemon!User www-data!g' \
|
-e 's!^(\s*User)\s+daemon\s*$!\1 www-data!g' \
|
||||||
-e 's!^Group daemon!Group www-data!g' \
|
-e 's!^(\s*Group)\s+daemon\s*$!\1 www-data!g' \
|
||||||
"$HTTPD_PREFIX/conf/httpd.conf" \
|
"$HTTPD_PREFIX/conf/httpd.conf" \
|
||||||
"$HTTPD_PREFIX/conf/extra/httpd-ssl.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"; \
|
||||||
\
|
\
|
||||||
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
|
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
|
||||||
apt-mark auto '.*' > /dev/null; \
|
apt-mark auto '.*' > /dev/null; \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue