From e399a8185522dc3d7755df6beead520b13bf80fd Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Mon, 6 Nov 2017 17:10:34 +0100 Subject: [PATCH] log php sur stderr + expose 8080 + WIP: correction mod_remoteip --- Dockerfile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f901c0d..7afcea6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Julien Cabillot " RUN sed -i'' 's/^Listen 80$/Listen 8080/' "/etc/apache2/ports.conf" && \ sed -i'' 's/^$//' '/etc/apache2/sites-enabled/000-default.conf' && \ - echo -e "RemoteIPHeader X-Real-IP\nRemoteIPProxiesHeader X-Forwarded-By" > "${APACHE_CONFDIR}/conf-available/remoteip.conf" && \ + echo "RemoteIPHeader X-Real-IP\nRemoteIPProxiesHeader X-Forwarded-By" > "${APACHE_CONFDIR}/conf-available/remoteip.conf" && \ a2enconf remoteip && \ a2enmod remoteip && \ apt-get -y autoremove --purge && \ @@ -15,7 +15,15 @@ RUN sed -i'' 's/^Listen 80$/Listen 8080/' "/etc/apache2/ports.conf" && \ "/var/cache/*" \ "/var/log/"{apt/*,dpkg.log} \ "/var/www/html" \ - "/tmp/*" + "/tmp/*" && \ + install --directory --group="www-data" --owner="www-data" --mode="2770" "/var/www/html" && \ + # On active les logs sur stderr (apache + php) + sed -ri 's#^(\s*ErrorLog)\s+\S+#\1 /proc/self/fd/2#g;' "/etc/apache2/apache2.conf" && \ + sed -ri ' \ + s#^(\s*CustomLog)\s+\S+#\1 /proc/self/fd/1#g; \ + s#^(\s*ErrorLog)\s+\S+#\1 /proc/self/fd/2#g; \ + ' "/etc/apache2/sites-enabled/000-default.conf" && \ + echo "error_reporting=E_ALL\nerror_log=/proc/self/fd/2\nlog_errors=On" > "/usr/local/etc/php/conf.d/error.ini" # Add Tini ENV "TINI_VERSION" "v0.16.1" @@ -25,5 +33,7 @@ ENTRYPOINT ["/tini", "--"] CMD [ "docker-php-entrypoint", "apache2-foreground" ] +EXPOSE "8080/tcp" + HEALTHCHECK --interval="10s" \ CMD curl --fail "http://localhost:8080" || exit 1