From 815298f5deea7796cf7968b61647606cdd8c8178 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 16 Apr 2020 12:36:40 +0200 Subject: [PATCH] Set Cache-Control header (#1073) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sandro Jäckel --- 16.0/apache/Dockerfile | 2 +- 17.0/apache/Dockerfile | 2 +- 18.0/apache/Dockerfile | 2 +- 19.0-beta/apache/Dockerfile | 2 +- update.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/16.0/apache/Dockerfile b/16.0/apache/Dockerfile index c078cc5b..c8d21656 100644 --- a/16.0/apache/Dockerfile +++ b/16.0/apache/Dockerfile @@ -106,7 +106,7 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod rewrite remoteip ;\ +RUN a2enmod headers rewrite remoteip ;\ {\ echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ diff --git a/17.0/apache/Dockerfile b/17.0/apache/Dockerfile index f2c1ef69..3dec4ce6 100644 --- a/17.0/apache/Dockerfile +++ b/17.0/apache/Dockerfile @@ -106,7 +106,7 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod rewrite remoteip ;\ +RUN a2enmod headers rewrite remoteip ;\ {\ echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ diff --git a/18.0/apache/Dockerfile b/18.0/apache/Dockerfile index e8c6a3de..90989acf 100644 --- a/18.0/apache/Dockerfile +++ b/18.0/apache/Dockerfile @@ -106,7 +106,7 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod rewrite remoteip ;\ +RUN a2enmod headers rewrite remoteip ;\ {\ echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ diff --git a/19.0-beta/apache/Dockerfile b/19.0-beta/apache/Dockerfile index 943b1a03..299e4d5c 100644 --- a/19.0-beta/apache/Dockerfile +++ b/19.0-beta/apache/Dockerfile @@ -106,7 +106,7 @@ RUN { \ VOLUME /var/www/html -RUN a2enmod rewrite remoteip ;\ +RUN a2enmod headers rewrite remoteip ;\ {\ echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ diff --git a/update.sh b/update.sh index 2c435c6b..9fa90267 100755 --- a/update.sh +++ b/update.sh @@ -18,7 +18,7 @@ declare -A base=( ) declare -A extras=( - [apache]='\nRUN a2enmod rewrite remoteip ;\\\n {\\\n echo RemoteIPHeader X-Real-IP ;\\\n echo RemoteIPTrustedProxy 10.0.0.0/8 ;\\\n echo RemoteIPTrustedProxy 172.16.0.0/12 ;\\\n echo RemoteIPTrustedProxy 192.168.0.0/16 ;\\\n } > /etc/apache2/conf-available/remoteip.conf;\\\n a2enconf remoteip' + [apache]='\nRUN a2enmod headers rewrite remoteip ;\\\n {\\\n echo RemoteIPHeader X-Real-IP ;\\\n echo RemoteIPTrustedProxy 10.0.0.0/8 ;\\\n echo RemoteIPTrustedProxy 172.16.0.0/12 ;\\\n echo RemoteIPTrustedProxy 192.168.0.0/16 ;\\\n } > /etc/apache2/conf-available/remoteip.conf;\\\n a2enconf remoteip' [fpm]='' [fpm-alpine]='' )