From e56a5124cbf9b88e01f0ebeab0b20d6dfeb25f10 Mon Sep 17 00:00:00 2001 From: ne20002 Date: Wed, 23 Apr 2025 16:33:27 +0000 Subject: [PATCH] added missing 'set -ex' as found in https://github.com/docker-library/official-images/pull/18901 --- 2024.12/apache/Dockerfile | 3 ++- 2025.02-dev/apache/Dockerfile | 3 ++- update.sh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/2024.12/apache/Dockerfile b/2024.12/apache/Dockerfile index f57090b..556214f 100644 --- a/2024.12/apache/Dockerfile +++ b/2024.12/apache/Dockerfile @@ -154,7 +154,8 @@ RUN set -ex; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini -RUN a2enmod headers rewrite remoteip; \ +RUN set -ex; \ + a2enmod headers rewrite remoteip; \ { \ echo RemoteIPHeader X-Forwarded-For; \ echo RemoteIPTrustedProxy 127.0.0.0/8; \ diff --git a/2025.02-dev/apache/Dockerfile b/2025.02-dev/apache/Dockerfile index e4add01..e47692b 100644 --- a/2025.02-dev/apache/Dockerfile +++ b/2025.02-dev/apache/Dockerfile @@ -154,7 +154,8 @@ RUN set -ex; \ } > /usr/local/etc/php/conf.d/friendica.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini -RUN a2enmod headers rewrite remoteip; \ +RUN set -ex; \ + a2enmod headers rewrite remoteip; \ { \ echo RemoteIPHeader X-Forwarded-For; \ echo RemoteIPTrustedProxy 127.0.0.0/8; \ diff --git a/update.sh b/update.sh index 47af492..950d11d 100755 --- a/update.sh +++ b/update.sh @@ -18,7 +18,8 @@ declare -A base=( ) declare -A extras=( - [apache]='RUN a2enmod headers rewrite remoteip; \ + [apache]='RUN set -ex; \ + a2enmod headers rewrite remoteip; \ { \ echo RemoteIPHeader X-Forwarded-For; \ echo RemoteIPTrustedProxy 127.0.0.0/8; \