diff --git a/2024.08/apache/Dockerfile b/2024.08/apache/Dockerfile index ca69575..e0f4958 100644 --- a/2024.08/apache/Dockerfile +++ b/2024.08/apache/Dockerfile @@ -158,7 +158,8 @@ RUN set -ex; \ RUN set -ex; \ a2enmod rewrite remoteip; \ { \ - echo RemoteIPHeader X-Real-IP; \ + echo RemoteIPHeader X-Forwarded-For; \ + echo RemoteIPTrustedProxy 127.0.0.0/8; \ echo RemoteIPTrustedProxy 10.0.0.0/8; \ echo RemoteIPTrustedProxy 172.16.0.0/12; \ echo RemoteIPTrustedProxy 192.168.0.0/16; \ diff --git a/2024.08/fpm-alpine/Dockerfile b/2024.08/fpm-alpine/Dockerfile index 8cd99d0..68a129f 100644 --- a/2024.08/fpm-alpine/Dockerfile +++ b/2024.08/fpm-alpine/Dockerfile @@ -134,7 +134,8 @@ RUN set -ex; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www - +RUN set -ex; \ + echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; VOLUME /var/www/html diff --git a/2024.08/fpm/Dockerfile b/2024.08/fpm/Dockerfile index 2c23ecd..3f57f54 100644 --- a/2024.08/fpm/Dockerfile +++ b/2024.08/fpm/Dockerfile @@ -155,7 +155,8 @@ RUN set -ex; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www - +RUN set -ex; \ + echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; VOLUME /var/www/html diff --git a/2024.12/apache/Dockerfile b/2024.12/apache/Dockerfile index bc39554..b20f33a 100644 --- a/2024.12/apache/Dockerfile +++ b/2024.12/apache/Dockerfile @@ -158,7 +158,8 @@ RUN set -ex; \ RUN set -ex; \ a2enmod rewrite remoteip; \ { \ - echo RemoteIPHeader X-Real-IP; \ + echo RemoteIPHeader X-Forwarded-For; \ + echo RemoteIPTrustedProxy 127.0.0.0/8; \ echo RemoteIPTrustedProxy 10.0.0.0/8; \ echo RemoteIPTrustedProxy 172.16.0.0/12; \ echo RemoteIPTrustedProxy 192.168.0.0/16; \ diff --git a/2024.12/fpm-alpine/Dockerfile b/2024.12/fpm-alpine/Dockerfile index 1f79ac5..6ae1154 100644 --- a/2024.12/fpm-alpine/Dockerfile +++ b/2024.12/fpm-alpine/Dockerfile @@ -134,7 +134,8 @@ RUN set -ex; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www - +RUN set -ex; \ + echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; VOLUME /var/www/html diff --git a/2024.12/fpm/Dockerfile b/2024.12/fpm/Dockerfile index cc23628..bda14b7 100644 --- a/2024.12/fpm/Dockerfile +++ b/2024.12/fpm/Dockerfile @@ -155,7 +155,8 @@ RUN set -ex; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www - +RUN set -ex; \ + echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; VOLUME /var/www/html diff --git a/2025.02-dev/apache/Dockerfile b/2025.02-dev/apache/Dockerfile index 06009d4..ef8224c 100644 --- a/2025.02-dev/apache/Dockerfile +++ b/2025.02-dev/apache/Dockerfile @@ -158,7 +158,8 @@ RUN set -ex; \ RUN set -ex; \ a2enmod rewrite remoteip; \ { \ - echo RemoteIPHeader X-Real-IP; \ + echo RemoteIPHeader X-Forwarded-For; \ + echo RemoteIPTrustedProxy 127.0.0.0/8; \ echo RemoteIPTrustedProxy 10.0.0.0/8; \ echo RemoteIPTrustedProxy 172.16.0.0/12; \ echo RemoteIPTrustedProxy 192.168.0.0/16; \ diff --git a/2025.02-dev/fpm-alpine/Dockerfile b/2025.02-dev/fpm-alpine/Dockerfile index d575edc..5b6e2e7 100644 --- a/2025.02-dev/fpm-alpine/Dockerfile +++ b/2025.02-dev/fpm-alpine/Dockerfile @@ -134,7 +134,8 @@ RUN set -ex; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www - +RUN set -ex; \ + echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; VOLUME /var/www/html diff --git a/2025.02-dev/fpm/Dockerfile b/2025.02-dev/fpm/Dockerfile index 52411ac..b57b3a9 100644 --- a/2025.02-dev/fpm/Dockerfile +++ b/2025.02-dev/fpm/Dockerfile @@ -155,7 +155,8 @@ RUN set -ex; \ chown -R www-data:root /var/www; \ chmod -R g=u /var/www - +RUN set -ex; \ + echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; VOLUME /var/www/html diff --git a/update.sh b/update.sh index f4e4973..45f5b68 100755 --- a/update.sh +++ b/update.sh @@ -21,14 +21,17 @@ declare -A extras=( [apache]='RUN set -ex; \ a2enmod rewrite remoteip; \ { \ - echo RemoteIPHeader X-Real-IP; \ + echo RemoteIPHeader X-Forwarded-For; \ + echo RemoteIPTrustedProxy 127.0.0.0/8; \ echo RemoteIPTrustedProxy 10.0.0.0/8; \ echo RemoteIPTrustedProxy 172.16.0.0/12; \ echo RemoteIPTrustedProxy 192.168.0.0/16; \ } > /etc/apache2/conf-available/remoteip.conf; \ a2enconf remoteip;' - [fpm]='' - [fpm-alpine]='' + [fpm]='RUN set -ex; \ + echo access.format = '\''%{REMOTE_ADDR}e - %u %t \"%m %r\" %s'\'' >> /usr/local/etc/php-fpm.d/docker.conf;' + [fpm-alpine]='RUN set -ex; \ + echo access.format = '\''%{REMOTE_ADDR}e - %u %t \"%m %r\" %s'\'' >> /usr/local/etc/php-fpm.d/docker.conf;' ) declare -A entrypoints=(