From 02cf2c3f47b50105c8e72711725ba5b5eb0b0620 Mon Sep 17 00:00:00 2001
From: Jonathan Thiry <github@jonathanthiry.com>
Date: Tue, 24 Oct 2023 14:09:06 +0200
Subject: [PATCH] Enable Apache mod_expires

It will allow Drupal to set cache headers https://github.com/drupal/drupal/blob/10.0.x/.htaccess#L34.

The expires module is enabled the same in the Wordpress Dockerfile https://github.com/docker-library/wordpress/blob/master/Dockerfile.template#L161
---
 10.0/php8.1/apache-bookworm/Dockerfile | 3 ++-
 10.0/php8.1/apache-bullseye/Dockerfile | 3 ++-
 10.0/php8.1/fpm-bookworm/Dockerfile    | 3 ++-
 10.0/php8.1/fpm-bullseye/Dockerfile    | 3 ++-
 10.0/php8.2/apache-bookworm/Dockerfile | 3 ++-
 10.0/php8.2/apache-bullseye/Dockerfile | 3 ++-
 10.0/php8.2/fpm-bookworm/Dockerfile    | 3 ++-
 10.0/php8.2/fpm-bullseye/Dockerfile    | 3 ++-
 10.1/php8.1/apache-bookworm/Dockerfile | 3 ++-
 10.1/php8.1/apache-bullseye/Dockerfile | 3 ++-
 10.1/php8.1/fpm-bookworm/Dockerfile    | 3 ++-
 10.1/php8.1/fpm-bullseye/Dockerfile    | 3 ++-
 10.1/php8.2/apache-bookworm/Dockerfile | 3 ++-
 10.1/php8.2/apache-bullseye/Dockerfile | 3 ++-
 10.1/php8.2/fpm-bookworm/Dockerfile    | 3 ++-
 10.1/php8.2/fpm-bullseye/Dockerfile    | 3 ++-
 7/php8.1/apache-bookworm/Dockerfile    | 3 ++-
 7/php8.1/apache-bullseye/Dockerfile    | 3 ++-
 7/php8.1/fpm-bookworm/Dockerfile       | 3 ++-
 7/php8.1/fpm-bullseye/Dockerfile       | 3 ++-
 7/php8.2/apache-bookworm/Dockerfile    | 3 ++-
 7/php8.2/apache-bullseye/Dockerfile    | 3 ++-
 7/php8.2/fpm-bookworm/Dockerfile       | 3 ++-
 7/php8.2/fpm-bullseye/Dockerfile       | 3 ++-
 9.5/php8.1/apache-bookworm/Dockerfile  | 3 ++-
 9.5/php8.1/apache-bullseye/Dockerfile  | 3 ++-
 9.5/php8.1/fpm-bookworm/Dockerfile     | 3 ++-
 9.5/php8.1/fpm-bullseye/Dockerfile     | 3 ++-
 9.5/php8.2/apache-bookworm/Dockerfile  | 3 ++-
 9.5/php8.2/apache-bullseye/Dockerfile  | 3 ++-
 9.5/php8.2/fpm-bookworm/Dockerfile     | 3 ++-
 9.5/php8.2/fpm-bullseye/Dockerfile     | 3 ++-
 Dockerfile.template                    | 3 ++-
 33 files changed, 66 insertions(+), 33 deletions(-)

diff --git a/10.0/php8.1/apache-bookworm/Dockerfile b/10.0/php8.1/apache-bookworm/Dockerfile
index ef10e300..3c1ea03d 100644
--- a/10.0/php8.1/apache-bookworm/Dockerfile
+++ b/10.0/php8.1/apache-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.0/php8.1/apache-bullseye/Dockerfile b/10.0/php8.1/apache-bullseye/Dockerfile
index 93ea22f8..042138b8 100644
--- a/10.0/php8.1/apache-bullseye/Dockerfile
+++ b/10.0/php8.1/apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.0/php8.1/fpm-bookworm/Dockerfile b/10.0/php8.1/fpm-bookworm/Dockerfile
index e7f758cc..dde8caf2 100644
--- a/10.0/php8.1/fpm-bookworm/Dockerfile
+++ b/10.0/php8.1/fpm-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.0/php8.1/fpm-bullseye/Dockerfile b/10.0/php8.1/fpm-bullseye/Dockerfile
index fd74472f..f7cfc2dd 100644
--- a/10.0/php8.1/fpm-bullseye/Dockerfile
+++ b/10.0/php8.1/fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.0/php8.2/apache-bookworm/Dockerfile b/10.0/php8.2/apache-bookworm/Dockerfile
index 33da995d..f5fc06fb 100644
--- a/10.0/php8.2/apache-bookworm/Dockerfile
+++ b/10.0/php8.2/apache-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.0/php8.2/apache-bullseye/Dockerfile b/10.0/php8.2/apache-bullseye/Dockerfile
index 436c6f9a..b505ffaf 100644
--- a/10.0/php8.2/apache-bullseye/Dockerfile
+++ b/10.0/php8.2/apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.0/php8.2/fpm-bookworm/Dockerfile b/10.0/php8.2/fpm-bookworm/Dockerfile
index dbd587de..7a8cc3c3 100644
--- a/10.0/php8.2/fpm-bookworm/Dockerfile
+++ b/10.0/php8.2/fpm-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.0/php8.2/fpm-bullseye/Dockerfile b/10.0/php8.2/fpm-bullseye/Dockerfile
index 69da7ae1..b4e68c1e 100644
--- a/10.0/php8.2/fpm-bullseye/Dockerfile
+++ b/10.0/php8.2/fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.1/php8.1/apache-bookworm/Dockerfile b/10.1/php8.1/apache-bookworm/Dockerfile
index a183b5de..93f096a9 100644
--- a/10.1/php8.1/apache-bookworm/Dockerfile
+++ b/10.1/php8.1/apache-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.1/php8.1/apache-bullseye/Dockerfile b/10.1/php8.1/apache-bullseye/Dockerfile
index d3e6c154..70c541a6 100644
--- a/10.1/php8.1/apache-bullseye/Dockerfile
+++ b/10.1/php8.1/apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.1/php8.1/fpm-bookworm/Dockerfile b/10.1/php8.1/fpm-bookworm/Dockerfile
index e87ee933..284b6936 100644
--- a/10.1/php8.1/fpm-bookworm/Dockerfile
+++ b/10.1/php8.1/fpm-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.1/php8.1/fpm-bullseye/Dockerfile b/10.1/php8.1/fpm-bullseye/Dockerfile
index bcb5c3d9..f5dd8553 100644
--- a/10.1/php8.1/fpm-bullseye/Dockerfile
+++ b/10.1/php8.1/fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.1/php8.2/apache-bookworm/Dockerfile b/10.1/php8.2/apache-bookworm/Dockerfile
index 2033035a..695fb641 100644
--- a/10.1/php8.2/apache-bookworm/Dockerfile
+++ b/10.1/php8.2/apache-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.1/php8.2/apache-bullseye/Dockerfile b/10.1/php8.2/apache-bullseye/Dockerfile
index 887b9449..c2c243c4 100644
--- a/10.1/php8.2/apache-bullseye/Dockerfile
+++ b/10.1/php8.2/apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.1/php8.2/fpm-bookworm/Dockerfile b/10.1/php8.2/fpm-bookworm/Dockerfile
index cc7ae38e..e9b118b0 100644
--- a/10.1/php8.2/fpm-bookworm/Dockerfile
+++ b/10.1/php8.2/fpm-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/10.1/php8.2/fpm-bullseye/Dockerfile b/10.1/php8.2/fpm-bullseye/Dockerfile
index 8937db3c..dfa2d83e 100644
--- a/10.1/php8.2/fpm-bullseye/Dockerfile
+++ b/10.1/php8.2/fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/7/php8.1/apache-bookworm/Dockerfile b/7/php8.1/apache-bookworm/Dockerfile
index 2b68d2fa..93cbf43a 100644
--- a/7/php8.1/apache-bookworm/Dockerfile
+++ b/7/php8.1/apache-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/7/php8.1/apache-bullseye/Dockerfile b/7/php8.1/apache-bullseye/Dockerfile
index 56dcae1f..f164cfe5 100644
--- a/7/php8.1/apache-bullseye/Dockerfile
+++ b/7/php8.1/apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/7/php8.1/fpm-bookworm/Dockerfile b/7/php8.1/fpm-bookworm/Dockerfile
index e6e43b6a..51158da4 100644
--- a/7/php8.1/fpm-bookworm/Dockerfile
+++ b/7/php8.1/fpm-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/7/php8.1/fpm-bullseye/Dockerfile b/7/php8.1/fpm-bullseye/Dockerfile
index a16c2b3c..edab3ec5 100644
--- a/7/php8.1/fpm-bullseye/Dockerfile
+++ b/7/php8.1/fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/7/php8.2/apache-bookworm/Dockerfile b/7/php8.2/apache-bookworm/Dockerfile
index 1c28f883..4c5828c7 100644
--- a/7/php8.2/apache-bookworm/Dockerfile
+++ b/7/php8.2/apache-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/7/php8.2/apache-bullseye/Dockerfile b/7/php8.2/apache-bullseye/Dockerfile
index eb28d432..70d6c93b 100644
--- a/7/php8.2/apache-bullseye/Dockerfile
+++ b/7/php8.2/apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/7/php8.2/fpm-bookworm/Dockerfile b/7/php8.2/fpm-bookworm/Dockerfile
index 1e142360..c8e11a76 100644
--- a/7/php8.2/fpm-bookworm/Dockerfile
+++ b/7/php8.2/fpm-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/7/php8.2/fpm-bullseye/Dockerfile b/7/php8.2/fpm-bullseye/Dockerfile
index 0e0d6e8a..f7f1a24e 100644
--- a/7/php8.2/fpm-bullseye/Dockerfile
+++ b/7/php8.2/fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/9.5/php8.1/apache-bookworm/Dockerfile b/9.5/php8.1/apache-bookworm/Dockerfile
index 7096b3ed..1ffd09c0 100644
--- a/9.5/php8.1/apache-bookworm/Dockerfile
+++ b/9.5/php8.1/apache-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/9.5/php8.1/apache-bullseye/Dockerfile b/9.5/php8.1/apache-bullseye/Dockerfile
index b2cd8e11..bd164c79 100644
--- a/9.5/php8.1/apache-bullseye/Dockerfile
+++ b/9.5/php8.1/apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-apache-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/9.5/php8.1/fpm-bookworm/Dockerfile b/9.5/php8.1/fpm-bookworm/Dockerfile
index 7ea389d1..b1c4319f 100644
--- a/9.5/php8.1/fpm-bookworm/Dockerfile
+++ b/9.5/php8.1/fpm-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/9.5/php8.1/fpm-bullseye/Dockerfile b/9.5/php8.1/fpm-bullseye/Dockerfile
index 941b8953..a7f262eb 100644
--- a/9.5/php8.1/fpm-bullseye/Dockerfile
+++ b/9.5/php8.1/fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.1-fpm-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/9.5/php8.2/apache-bookworm/Dockerfile b/9.5/php8.2/apache-bookworm/Dockerfile
index 55ed08aa..8c900ae7 100644
--- a/9.5/php8.2/apache-bookworm/Dockerfile
+++ b/9.5/php8.2/apache-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/9.5/php8.2/apache-bullseye/Dockerfile b/9.5/php8.2/apache-bullseye/Dockerfile
index be34a36b..ec36077e 100644
--- a/9.5/php8.2/apache-bullseye/Dockerfile
+++ b/9.5/php8.2/apache-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-apache-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/9.5/php8.2/fpm-bookworm/Dockerfile b/9.5/php8.2/fpm-bookworm/Dockerfile
index 725c0cca..d9f3515f 100644
--- a/9.5/php8.2/fpm-bookworm/Dockerfile
+++ b/9.5/php8.2/fpm-bookworm/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bookworm
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/9.5/php8.2/fpm-bullseye/Dockerfile b/9.5/php8.2/fpm-bullseye/Dockerfile
index 6c20ae21..f6ef342d 100644
--- a/9.5/php8.2/fpm-bullseye/Dockerfile
+++ b/9.5/php8.2/fpm-bullseye/Dockerfile
@@ -11,7 +11,8 @@ FROM php:8.2-fpm-bullseye
 RUN set -eux; \
 	\
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
diff --git a/Dockerfile.template b/Dockerfile.template
index 71c775b3..5b347837 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -20,7 +20,8 @@ RUN set -eux; \
 		postgresql-dev \
 {{ ) else ( -}}
 	if command -v a2enmod; then \
-		a2enmod rewrite; \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
 	fi; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \