@lando/php 1.7.1 → 1.9.0

package/.lando.yml

@@ -5,7 +5,7 @@ proxy:
 services:
   cli:
     api: 4
-    image: node:18
+    image: node:20
     command: sleep infinity
     ports:
       - 5173:5173/http

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.9.0 - [December 5, 2025](https://github.com/lando/php/releases/tag/v1.9.0)
+
+* Added support for PHP 8.5
+* Added Debian 13 (trixie) base images for PHP 8.3-8.5
+* Changed PHP 7.4 and 8.0 images to use MariaDB `archive.mariadb.org` apt repository
+* Fixed expired keys preventing stretch-based images from building
+
+## v1.8.0 - [September 2, 2025](https://github.com/lando/php/releases/tag/v1.8.0)
+
+* Removed automatic installation of `hirak/prestissimo` for `composer:1`
+* Switched images to [bitnamilegacy](https://github.com/bitnami/containers/issues/83267) namespace
+* Updated to [@lando/nginx@1.5.0](https://github.com/lando/nginx/releases/tag/v1.5.0)
+
 ## v1.7.1 - [January 15, 2025](https://github.com/lando/php/releases/tag/v1.7.1)
 
 * Improved the `php` service builder to mount a unique scripts directory per service to prevent version conflicts.

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Lando Alliance
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -54,5 +54,8 @@ Made with [contributors-img](https://contrib.rocks).
 
 ## Other Selected Resources
 
-* [LICENSE](https://github.com/lando/php/blob/main/LICENSE.md)
-* [The best professional advice ever](https://www.youtube.com/watch?v=tkBVDh7my9Q)
+* [LICENSE](/LICENSE)
+* [TERMS OF USE](https://docs.lando.dev/terms)
+* [PRIVACY POLICY](https://docs.lando.dev/privacy)
+* [CODE OF CONDUCT](https://docs.lando.dev/coc)
+

package/builders/php.js

@@ -126,7 +126,7 @@ module.exports = {
   name: 'php',
   config: {
     version: '7.4',
-    supported: ['8.4', '8.3', '8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
+    supported: ['8.5', '8.4', '8.3', '8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
     legacy: ['7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
     gen2: ['5.5', '5.4', '5.3'],
     path: [
@@ -163,7 +163,7 @@ module.exports = {
     },
     scriptsDir: path.resolve(__dirname, '..', 'scripts'),
     sources: [],
-    suffix: '5',
+    suffix: '6',
     ssl: false,
     via: 'apache',
     volumes: ['/usr/local/bin'],
@@ -218,13 +218,6 @@ module.exports = {
       } else if (typeof options.composer_version === 'number') {
         options.composer_version = options.composer_version.toString();
       }
-      const usingComposer1 = options.composer_version && semver.satisfies(options.composer_version, '1.x');
-
-      // Add prestissimo as a global package for Composer 1.x performance improvements. Requires PHP >= 5.3
-      if (usingComposer1 && phpSemver && semver.gte(phpSemver, '5.3.0')) {
-        options.composer = options.composer || {};
-        options.composer = {'hirak/prestissimo': '*', ...options.composer};
-      }
 
       // Add build step to enable xdebug
       if (options.xdebug) {

package/images/5.6-apache/Dockerfile

@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:5.6-apache-5 .
+# docker build -t devwithlando/php:5.6-apache-6 .
 
 FROM php:5.6-apache-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \

package/images/5.6-fpm/Dockerfile

@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:5.6-fpm-5 .
+# docker build -t devwithlando/php:5.6-fpm-6 .
 
 FROM php:5.6-fpm-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \

package/images/7.0-apache/Dockerfile

@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:7.0-apache-5 .
+# docker build -t devwithlando/php:7.0-apache-6 .
 
 FROM php:7.0-apache-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \

package/images/7.0-fpm/Dockerfile

@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:7.0-fpm-5 .
+# docker build -t devwithlando/php:7.0-fpm-6 .
 
 FROM php:7.0-fpm-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \

package/images/7.1-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.1-apache-5 .
+# docker build -t devwithlando/php:7.1-apache-6 .
 
 FROM php:7.1-apache-buster
 

package/images/7.1-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.1-fpm-5 .
+# docker build -t devwithlando/php:7.1-fpm-6 .
 
 FROM php:7.1-fpm-buster
 

package/images/7.2-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.2-apache-5 .
+# docker build -t devwithlando/php:7.2-apache-6 .
 
 FROM php:7.2-apache-buster
 

package/images/7.2-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.2-fpm-5 .
+# docker build -t devwithlando/php:7.2-fpm-6 .
 
 FROM php:7.2-fpm-buster
 

package/images/7.3-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.3-apache-5 .
+# docker build -t devwithlando/php:7.3-apache-6 .
 
 FROM php:7.3-apache-bullseye
 

package/images/7.3-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.3-fpm-5 .
+# docker build -t devwithlando/php:7.3-fpm-6 .
 
 FROM php:7.3-fpm-bullseye
 

package/images/7.4-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.4-apache-5 .
+# docker build -t devwithlando/php:7.4-apache-6 .
 
 FROM php:7.4-apache-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \

package/images/7.4-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.4-fpm-5 .
+# docker build -t devwithlando/php:7.4-fpm-6 .
 
 FROM php:7.4-fpm-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \

package/images/8.0-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.0-apache-5 .
+# docker build -t devwithlando/php:8.0-apache-6 .
 
 FROM php:8.0-apache-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \

package/images/8.0-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.0-fpm-5 .
+# docker build -t devwithlando/php:8.0-fpm-6 .
 
 FROM php:8.0-fpm-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \

package/images/8.1-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.1-apache-5 .
+# docker build -t devwithlando/php:8.1-apache-6 .
 
 FROM php:8.1-apache-bookworm
 

package/images/8.1-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.1-fpm-5 .
+# docker build -t devwithlando/php:8.1-fpm-6 .
 
 FROM php:8.1-fpm-bookworm
 

package/images/8.2-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.2-apache-5 .
+# docker build -t devwithlando/php:8.2-apache-6 .
 
 FROM php:8.2-apache-bookworm
 

package/images/8.2-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.2-fpm-5 .
+# docker build -t devwithlando/php:8.2-fpm-6 .
 
 FROM php:8.2-fpm-bookworm
 

package/images/8.3-apache/Dockerfile

@@ -1,41 +1,27 @@
-# docker build -t devwithlando/php:8.3-apache-5 .
+# docker build -t devwithlando/php:8.3-apache-6 .
 
-FROM php:8.3-apache-bookworm
+FROM php:8.3-apache-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
-  exiftool \
-  git-core \
+  libimage-exiftool-perl \
+  git \
   gnupg2 \
   imagemagick \
-  postgresql-client-15 \
+  mariadb-client \
+  mariadb-client-compat \
+  postgresql-client-17 \
   pv \
   rsync \
   ssh \
   unzip \
-  wget \
-  /tmp/sqlite3.deb \
-  /tmp/libsqlite3-0.deb \
-  /tmp/libsqlite3-dev.deb
+  wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \

package/images/8.3-fpm/Dockerfile

@@ -1,42 +1,27 @@
-# docker build -t devwithlando/php:8.3-fpm-5 .
+# docker build -t devwithlando/php:8.3-fpm-6 .
 
-FROM php:8.3-fpm-bookworm
+FROM php:8.3-fpm-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
-  exiftool \
-  git-core \
+  libimage-exiftool-perl \
+  git \
   gnupg2 \
   imagemagick \
   mariadb-client \
-  postgresql-client-15 \
+  mariadb-client-compat \
+  postgresql-client-17 \
   pv \
   rsync \
   ssh \
   unzip \
-  wget \
-  /tmp/sqlite3.deb \
-  /tmp/libsqlite3-0.deb \
-  /tmp/libsqlite3-dev.deb
+  wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \

package/images/8.4-apache/Dockerfile

@@ -1,43 +1,27 @@
-# docker build -t devwithlando/php:8.4-apache-5 .
+# docker build -t devwithlando/php:8.4-apache-6 .
 
-FROM php:8.4-apache-bookworm
+FROM php:8.4-apache-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     default-mysql-client \
-    exiftool \
-    git-core \
+    libimage-exiftool-perl \
+    git \
     gnupg2 \
     imagemagick \
     mariadb-client \
     mariadb-client-compat \
-    postgresql-client-15 \
+    postgresql-client-17 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget \
-    /tmp/sqlite3.deb \
-    /tmp/libsqlite3-0.deb \
-    /tmp/libsqlite3-dev.deb
+    wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \

package/images/8.4-fpm/Dockerfile

@@ -1,44 +1,28 @@
-# docker build -t devwithlando/php:8.4-fpm-5 .
+# docker build -t devwithlando/php:8.4-fpm-6 .
 
-FROM php:8.4-fpm-bookworm
+FROM php:8.4-fpm-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     bzip2 \
     default-mysql-client \
-    exiftool \
-    git-core \
+    libimage-exiftool-perl \
+    git \
     gnupg2 \
     imagemagick \
     mariadb-client \
     mariadb-client-compat \
-    postgresql-client-15 \
+    postgresql-client-17 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget \
-    /tmp/sqlite3.deb \
-    /tmp/libsqlite3-0.deb \
-    /tmp/libsqlite3-dev.deb
+    wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \

package/images/8.5-apache/Dockerfile

@@ -0,0 +1,62 @@
+# docker buildx build -t devwithlando/php:8.5-apache-6 .
+
+FROM php:8.5-apache-trixie
+
+ARG TARGETARCH
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt -y update && apt-get install -y \
+    default-mysql-client \
+    libimage-exiftool-perl \
+    git \
+    gnupg2 \
+    imagemagick \
+    mariadb-client \
+    mariadb-client-compat \
+    postgresql-client-17 \
+    pv \
+    rsync \
+    ssh \
+    unzip \
+    wget
+
+RUN \
+  install-php-extensions @fix_letsencrypt \
+  && install-php-extensions apcu \
+  && install-php-extensions bcmath \
+  && install-php-extensions bz2 \
+  && install-php-extensions calendar \
+  && install-php-extensions exif \
+  && install-php-extensions gd \
+  && install-php-extensions gettext \
+  && install-php-extensions imagick/imagick@master \
+  && install-php-extensions imap \
+  && install-php-extensions intl \
+  && install-php-extensions ldap \
+  && install-php-extensions mbstring \
+  && install-php-extensions memcached \
+  && install-php-extensions mysqli \
+  && install-php-extensions oauth \
+  && install-php-extensions opcache \
+  && install-php-extensions pcntl \
+  && install-php-extensions pdo \
+  && install-php-extensions pdo_mysql \
+  && install-php-extensions pdo_pgsql \
+  && install-php-extensions redis \
+  && install-php-extensions soap \
+  && install-php-extensions xhprof \
+  && install-php-extensions zip
+
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug/xdebug@master \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
+RUN \
+  chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
+  && apt-get -y clean \
+  && apt-get -y autoclean \
+  && apt-get -y autoremove \
+  && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/*