diff --git a/Dockerfile b/Dockerfile index 7b43c48..10e8148 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN export DEBIAN_FRONTEND="noninteractive" && \ sed -i'' 's/ServerSignature On/ServerSignature Off/; s/ServerTokens OS/ServerTokens Prod/' "/etc/apache2/conf-enabled/security.conf" && \ sed -i'' 's/^Listen 80$/Listen 8080/' "/etc/apache2/ports.conf" && \ sed -i'' 's/^$//' '/etc/apache2/sites-enabled/000-default.conf' && \ - echo "RemoteIPHeader X-Forwarded-For\nRemoteIPProxiesHeader X-Forwarded-By\nRemoteIPInternalProxy 10.0.0.0/8\nRemoteIPInternalProxy 192.168.0.0/16\nRemoteIPInternalProxy 172.16.0.0/12" > "${APACHE_CONFDIR}/conf-available/remoteip.conf" && \ + printf 'RemoteIPHeader X-Forwarded-For\nRemoteIPProxiesHeader X-Forwarded-By\nRemoteIPInternalProxy 10.0.0.0/8\nRemoteIPInternalProxy 192.168.0.0/16\nRemoteIPInternalProxy 172.16.0.0/12\n' > "${APACHE_CONFDIR}/conf-available/remoteip.conf" && \ sed -i'' 's/\(LogFormat "%h.*combined\)/LogFormat "%a %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\"" combined/' "${APACHE_CONFDIR}/apache2.conf" && \ echo 'AddType video/mp4 .mp4' >> /etc/apache2/sites-enabled/000-default.conf && \ a2enconf remoteip && \ @@ -30,7 +30,7 @@ RUN export DEBIAN_FRONTEND="noninteractive" && \ 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\nexpose_php=Off" > "/usr/local/etc/php/conf.d/override.ini" && \ + printf 'error_reporting=E_ALL\nerror_log=/proc/self/fd/2\nlog_errors=On\nexpose_php=Off\n' > "/usr/local/etc/php/conf.d/override.ini" && \ docker-php-ext-configure pcntl --enable-pcntl && \ docker-php-ext-install pcntl @@ -43,5 +43,4 @@ CMD [ "docker-php-entrypoint", "apache2-foreground" ] EXPOSE 8080/tcp # TODO: à remettre une fois le bug corrigé -#HEALTHCHECK --interval="5s" \ -# CMD curl --fail "http://localhost:8080" || exit 1 +#HEALTHCHECK --interval=5s -- CMD curl --fail http://localhost:8080 || exit 1