Merge pull request #247 from jonathanthiry/patch-1

Enable Apache mod_expires
docker-library · Dec 2, 2023 · ee9db81 · ee9db81
2 parents b2ba48a + 02cf2c3
commit ee9db81
Show file tree

Hide file tree

Showing 33 changed files with 66 additions and 33 deletions.
diff --git a/10.0/php8.1/apache-bookworm/Dockerfile b/10.0/php8.1/apache-bookworm/Dockerfile
diff --git a/10.0/php8.1/apache-bullseye/Dockerfile b/10.0/php8.1/apache-bullseye/Dockerfile
diff --git a/10.0/php8.1/fpm-bookworm/Dockerfile b/10.0/php8.1/fpm-bookworm/Dockerfile
diff --git a/10.0/php8.1/fpm-bullseye/Dockerfile b/10.0/php8.1/fpm-bullseye/Dockerfile
diff --git a/10.0/php8.2/apache-bookworm/Dockerfile b/10.0/php8.2/apache-bookworm/Dockerfile
diff --git a/10.0/php8.2/apache-bullseye/Dockerfile b/10.0/php8.2/apache-bullseye/Dockerfile
diff --git a/10.0/php8.2/fpm-bookworm/Dockerfile b/10.0/php8.2/fpm-bookworm/Dockerfile
diff --git a/10.0/php8.2/fpm-bullseye/Dockerfile b/10.0/php8.2/fpm-bullseye/Dockerfile
diff --git a/10.1/php8.1/apache-bookworm/Dockerfile b/10.1/php8.1/apache-bookworm/Dockerfile
diff --git a/10.1/php8.1/apache-bullseye/Dockerfile b/10.1/php8.1/apache-bullseye/Dockerfile
diff --git a/10.1/php8.1/fpm-bookworm/Dockerfile b/10.1/php8.1/fpm-bookworm/Dockerfile
diff --git a/10.1/php8.1/fpm-bullseye/Dockerfile b/10.1/php8.1/fpm-bullseye/Dockerfile
diff --git a/10.1/php8.2/apache-bookworm/Dockerfile b/10.1/php8.2/apache-bookworm/Dockerfile
diff --git a/10.1/php8.2/apache-bullseye/Dockerfile b/10.1/php8.2/apache-bullseye/Dockerfile
diff --git a/10.1/php8.2/fpm-bookworm/Dockerfile b/10.1/php8.2/fpm-bookworm/Dockerfile
diff --git a/10.1/php8.2/fpm-bullseye/Dockerfile b/10.1/php8.2/fpm-bullseye/Dockerfile
diff --git a/7/php8.1/apache-bookworm/Dockerfile b/7/php8.1/apache-bookworm/Dockerfile
diff --git a/7/php8.1/apache-bullseye/Dockerfile b/7/php8.1/apache-bullseye/Dockerfile
diff --git a/7/php8.1/fpm-bookworm/Dockerfile b/7/php8.1/fpm-bookworm/Dockerfile
diff --git a/7/php8.1/fpm-bullseye/Dockerfile b/7/php8.1/fpm-bullseye/Dockerfile
diff --git a/7/php8.2/apache-bookworm/Dockerfile b/7/php8.2/apache-bookworm/Dockerfile
diff --git a/7/php8.2/apache-bullseye/Dockerfile b/7/php8.2/apache-bullseye/Dockerfile
diff --git a/7/php8.2/fpm-bookworm/Dockerfile b/7/php8.2/fpm-bookworm/Dockerfile
diff --git a/7/php8.2/fpm-bullseye/Dockerfile b/7/php8.2/fpm-bullseye/Dockerfile
diff --git a/9.5/php8.1/apache-bookworm/Dockerfile b/9.5/php8.1/apache-bookworm/Dockerfile
diff --git a/9.5/php8.1/apache-bullseye/Dockerfile b/9.5/php8.1/apache-bullseye/Dockerfile
diff --git a/9.5/php8.1/fpm-bookworm/Dockerfile b/9.5/php8.1/fpm-bookworm/Dockerfile
diff --git a/9.5/php8.1/fpm-bullseye/Dockerfile b/9.5/php8.1/fpm-bullseye/Dockerfile
diff --git a/9.5/php8.2/apache-bookworm/Dockerfile b/9.5/php8.2/apache-bookworm/Dockerfile
diff --git a/9.5/php8.2/apache-bullseye/Dockerfile b/9.5/php8.2/apache-bullseye/Dockerfile
diff --git a/9.5/php8.2/fpm-bookworm/Dockerfile b/9.5/php8.2/fpm-bookworm/Dockerfile
diff --git a/9.5/php8.2/fpm-bullseye/Dockerfile b/9.5/php8.2/fpm-bullseye/Dockerfile
diff --git 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)"; \