docker-library
/
httpd
mirror of https://github.com/docker-library/httpd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust "extra/httpd-ssl.conf" logging also 

(And add "TransferLog" to the list of logging directives we update)
This commit is contained in:
Tianon Gravi 2019-02-08 14:14:55 -08:00
parent b3146c0dc0
commit f6cb814440
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
2.4/Dockerfile
View File

@ -124,7 +124,10 @@ RUN set -eux; \
sed -ri \ sed -ri \
-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' \
"$HTTPD_PREFIX/conf/httpd.conf"; \ -e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \
"$HTTPD_PREFIX/conf/httpd.conf" \
"$HTTPD_PREFIX/conf/extra/httpd-ssl.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; \

5
2.4/alpine/Dockerfile
View File

@ -127,7 +127,10 @@ RUN set -eux; \
sed -ri \ sed -ri \
-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' \
"$HTTPD_PREFIX/conf/httpd.conf"; \ -e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \
"$HTTPD_PREFIX/conf/httpd.conf" \
"$HTTPD_PREFIX/conf/extra/httpd-ssl.conf" \
; \
\ \
runDeps="$runDeps $( \ runDeps="$runDeps $( \
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \