summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2020-04-16 12:36:40 +0200
committerGitHub <noreply@github.com>2020-04-16 10:36:40 +0000
commit815298f5deea7796cf7968b61647606cdd8c8178 (patch)
tree35fefa60f90fde8bd78729f22feb11a90f5614df
parent1891bfa5e09842b6d92719d44b7fe01594227c38 (diff)
Set Cache-Control header (#1073)
Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
-rw-r--r--16.0/apache/Dockerfile2
-rw-r--r--17.0/apache/Dockerfile2
-rw-r--r--18.0/apache/Dockerfile2
-rw-r--r--19.0-beta/apache/Dockerfile2
-rwxr-xr-xupdate.sh2
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]=''
)