From 7b20314e51595b0876a2f97d0109201f0163d914 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Thu, 25 Apr 2024 20:26:03 +0200
Subject: [PATCH] Issue #3226187 by effulgentsia, andypost: Enable mod_headers
 and mod_expires on Apache

---
 php/8.1-apache/Dockerfile        | 2 +-
 php/8.2-apache/Dockerfile        | 2 +-
 php/8.3-apache/Dockerfile        | 2 +-
 php/8.3-ubuntu-apache/Dockerfile | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/php/8.1-apache/Dockerfile b/php/8.1-apache/Dockerfile
index 20be4b7a..ed8070c0 100644
--- a/php/8.1-apache/Dockerfile
+++ b/php/8.1-apache/Dockerfile
@@ -52,7 +52,7 @@ RUN { \
 COPY ./conf/apache2/vhost.conf /etc/apache2/sites-available/drupal.conf
 COPY ./apache2-foreground /usr/local/bin/
 
-RUN a2enmod rewrite \
+RUN a2enmod expires headers rewrite \
     && a2dissite 000-default.conf \
     && a2ensite drupal
 
diff --git a/php/8.2-apache/Dockerfile b/php/8.2-apache/Dockerfile
index a87909ca..79bcc78c 100644
--- a/php/8.2-apache/Dockerfile
+++ b/php/8.2-apache/Dockerfile
@@ -254,7 +254,7 @@ COPY ./apache2-foreground /usr/local/bin/
 
 # Apache + PHP requires preforking Apache for best results
 RUN a2dismod mpm_event && a2enmod mpm_prefork &&\
-	a2enmod rewrite &&\
+	a2enmod expires headers rewrite &&\
 	\
 # PHP files should be handled by PHP, and should be preferred over any other file type
 	{ \
diff --git a/php/8.3-apache/Dockerfile b/php/8.3-apache/Dockerfile
index 5b071e86..a80366d4 100644
--- a/php/8.3-apache/Dockerfile
+++ b/php/8.3-apache/Dockerfile
@@ -249,7 +249,7 @@ COPY ./apache2-foreground /usr/local/bin/
 
 # Apache + PHP requires preforking Apache for best results
 RUN a2dismod mpm_event && a2enmod mpm_prefork &&\
-	a2enmod rewrite &&\
+	a2enmod expires headers rewrite &&\
 	\
 # PHP files should be handled by PHP, and should be preferred over any other file type
 	{ \
diff --git a/php/8.3-ubuntu-apache/Dockerfile b/php/8.3-ubuntu-apache/Dockerfile
index 40f5c2bb..ef3ea7c8 100644
--- a/php/8.3-ubuntu-apache/Dockerfile
+++ b/php/8.3-ubuntu-apache/Dockerfile
@@ -249,7 +249,7 @@ COPY ./apache2-foreground /usr/local/bin/
 
 # Apache + PHP requires preforking Apache for best results
 RUN a2dismod mpm_event && a2enmod mpm_prefork &&\
-	a2enmod rewrite &&\
+	a2enmod expires headers rewrite &&\
 	\
 # PHP files should be handled by PHP, and should be preferred over any other file type
 	{ \
-- 
GitLab