web/phpapache
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

log php sur stderr + expose 8080 + WIP: correction mod_remoteip

Browse Source
This commit is contained in:
Julien Cabillot 2017-11-06 17:10:34 +01:00 committed by root
parent 0c9cf191e0
commit e399a81855
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER "Julien Cabillot <dockerimages@cabillot.eu>"
RUN sed -i'' 's/^Listen 80$/Listen 8080/' "/etc/apache2/ports.conf" && \
sed -i'' 's/^<VirtualHost \*:80>$/<VirtualHost *:8080>/' '/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