feat: Add Trixie variant and update CI

This commit introduces support for the Trixie PHP variant in the Docker build process.
It includes the necessary changes to the CI workflow `.github/workflows/docker-buildx.yml` to include `apache-trixie` in the matrix strategy and generate appropriate Docker tags.
Additionally, a new Dockerfile `php8/apache-trixie/Dockerfile` is added to define the build for the Trixie variant.

Author: hussainweb

.github/workflows/docker-buildx.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         php_version: ["8.1", "8.2", "8.3", "8.4"]
-        variant: ["apache-bookworm", "fpm-alpine"]
+        variant: ["apache-trixie", "apache-bookworm", "fpm-alpine"]
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -42,12 +42,34 @@ jobs:
       - name: Set Dockerfile directory
         if: ${{ matrix.php_version == '8.1' || matrix.php_version == '8.2' || matrix.php_version == '8.3' || matrix.php_version == '8.4' }}
         run: echo "DOCKERFILE_DIR=php8" >> $GITHUB_ENV
+      - name: Generate Docker tags
+        id: tags
+        run: |
+          # Base tag with full variant name
+          TAGS="hussainweb/drupal-base:php${{ matrix.php_version }}-${{ matrix.variant }}"
+
+          # For apache-trixie, add the short version tag (e.g., php8.4)
+          if [ "${{ matrix.variant }}" = "apache-trixie" ]; then
+            TAGS="${TAGS},hussainweb/drupal-base:php${{ matrix.php_version }}"
+          fi
+
+          # For fpm-alpine, add the short -alpine tag (e.g., php8.4-alpine)
+          if [ "${{ matrix.variant }}" = "fpm-alpine" ]; then
+            TAGS="${TAGS},hussainweb/drupal-base:php${{ matrix.php_version }}-alpine"
+          fi
+
+          # For the latest PHP version on apache-trixie, add the latest tag
+          if [ "${{ matrix.php_version }}" = "8.4" ] && [ "${{ matrix.variant }}" = "apache-trixie" ]; then
+            TAGS="${TAGS},hussainweb/drupal-base:latest"
+          fi
+
+          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
       - name: Build and push Docker image for PHP ${{ matrix.php_version }}
         uses: docker/build-push-action@v6
         with:
           context: ${{ env.DOCKERFILE_DIR }}/${{ matrix.variant }}/
           push: ${{ github.event_name != 'pull_request' }}
-          tags: hussainweb/drupal-base:php${{ matrix.php_version }}${{ matrix.variant == 'fpm-alpine' && '-alpine' || '' }}${{ matrix.php_version == '8.4' && ',hussainweb/drupal-base:latest' || '' }}
+          tags: ${{ steps.tags.outputs.tags }}
           build-args: |
             PHP_VERSION=${{ matrix.php_version }}-${{ matrix.variant }}
           platforms: linux/amd64,linux/arm64

php8/apache-trixie/Dockerfile

@@ -0,0 +1,113 @@
+ARG PHP_VERSION=8.4-apache-trixie
+# from https://www.drupal.org/docs/system-requirements/php-requirements
+FROM php:${PHP_VERSION}
+
+# install the PHP extensions we need
+RUN set -eux; \
+	\
+	if command -v a2enmod; then \
+# https://github.com/drupal/drupal/blob/d91d8d0a6d3ffe5f0b6dde8c2fbe81404843edc5/.htaccess (references both mod_expires and mod_rewrite explicitly)
+		a2enmod expires rewrite; \
+	fi; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		git \
+		unzip \
+		sendmail \
+		mariadb-client \
+	; \
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		libavif-dev \
+		libbz2-dev \
+		libfreetype6-dev \
+		libicu-dev \
+		libjpeg-dev \
+		libmemcached-dev \
+		libpng-dev \
+		libpq-dev \
+		libwebp-dev \
+		libyaml-dev \
+		libzip-dev \
+	; \
+	\
+	docker-php-ext-configure gd \
+		--with-avif \
+		--with-freetype \
+		--with-jpeg=/usr \
+		--with-webp \
+	; \
+	\
+	docker-php-ext-install -j "$(nproc)" \
+		bcmath \
+		bz2 \
+		exif \
+		gd \
+		intl \
+		opcache \
+		pcntl \
+		pdo_mysql \
+		pdo_pgsql \
+		sockets \
+		zip \
+	; \
+	\
+	pecl install \
+		apcu \
+		memcached \
+		redis \
+		yaml \
+	; \
+	\
+	docker-php-ext-enable \
+		apcu \
+		memcached \
+		redis \
+		yaml \
+	; \
+	\
+# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+	apt-mark auto '.*' > /dev/null; \
+	apt-mark manual $savedAptMark; \
+	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| sort -u \
+		| xargs -r dpkg-query -S \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -rt apt-mark manual; \
+	\
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*
+
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=60'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
+# Remove the memory limit for the CLI only.
+	echo 'memory_limit = -1' > /usr/local/etc/php/php-cli.ini; \
+# Change docroot since we use Composer Drupal project.
+	sed -ri -e 's!/var/www/html!/var/www/html/web!g' /etc/apache2/sites-available/*.conf; \
+	sed -ri -e 's!/var/www!/var/www/html/web!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+
+
+# https://www.drupal.org/node/3298550
+# Drupal now recommends sites enable PHP output buffering by default, if PHP is run as a server module
+# e.g. with Apache's mod_php
+RUN { \
+		echo 'output_buffering=true'; \
+	} > /usr/local/etc/php/conf.d/docker-php-drupal-recommended.ini
+
+WORKDIR /var/www/html
+
+ENV COMPOSER_ALLOW_SUPERUSER=1
+COPY --from=composer:2 /usr/bin/composer /usr/local/bin/
+ENV PATH=${PATH}:/var/www/html/vendor/bin