@lando/drupal 1.12.0 → 1.14.0

package/node_modules/@lando/php/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-7 .
 
 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/node_modules/@lando/php/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-7 .
 
 FROM php:7.1-apache-buster
 

package/node_modules/@lando/php/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-7 .
 
 FROM php:7.1-fpm-buster
 

package/node_modules/@lando/php/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-7 .
 
 FROM php:7.2-apache-buster
 

package/node_modules/@lando/php/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-7 .
 
 FROM php:7.2-fpm-buster
 

package/node_modules/@lando/php/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-7 .
 
 FROM php:7.3-apache-bullseye
 

package/node_modules/@lando/php/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-7 .
 
 FROM php:7.3-fpm-bullseye
 

package/node_modules/@lando/php/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-7 .
 
 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/node_modules/@lando/php/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-7 .
 
 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/node_modules/@lando/php/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-7 .
 
 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/node_modules/@lando/php/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-7 .
 
 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/node_modules/@lando/php/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-7 .
 
 FROM php:8.1-apache-bookworm
 

package/node_modules/@lando/php/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-7 .
 
 FROM php:8.1-fpm-bookworm
 

package/node_modules/@lando/php/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-7 .
 
 FROM php:8.2-apache-bookworm
 

package/node_modules/@lando/php/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-7 .
 
 FROM php:8.2-fpm-bookworm
 

package/node_modules/@lando/php/images/8.3-apache/Dockerfile

@@ -1,41 +1,30 @@
-# docker build -t devwithlando/php:8.3-apache-5 .
+# docker build -t devwithlando/php:8.3-apache-7 .
 
-FROM php:8.3-apache-bookworm
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+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 \
@@ -68,6 +57,18 @@ RUN \
 RUN install-php-extensions xdebug \
   && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/node_modules/@lando/php/images/8.3-fpm/Dockerfile

@@ -1,42 +1,30 @@
-# docker build -t devwithlando/php:8.3-fpm-5 .
+# docker build -t devwithlando/php:8.3-fpm-7 .
 
-FROM php:8.3-fpm-bookworm
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+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 \
@@ -69,6 +57,18 @@ RUN \
 RUN install-php-extensions xdebug \
   && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/node_modules/@lando/php/images/8.4-apache/Dockerfile

@@ -1,43 +1,30 @@
-# docker build -t devwithlando/php:8.4-apache-5 .
+# docker build -t devwithlando/php:8.4-apache-7 .
 
-FROM php:8.4-apache-bookworm
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+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 \
@@ -70,6 +57,18 @@ RUN \
 RUN install-php-extensions xdebug \
   && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/node_modules/@lando/php/images/8.4-fpm/Dockerfile

@@ -1,44 +1,31 @@
-# docker build -t devwithlando/php:8.4-fpm-5 .
+# docker build -t devwithlando/php:8.4-fpm-7 .
 
-FROM php:8.4-fpm-bookworm
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+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 \
@@ -71,6 +58,18 @@ RUN \
 RUN install-php-extensions xdebug \
   && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/node_modules/@lando/php/images/8.5-apache/Dockerfile

@@ -0,0 +1,77 @@
+# docker buildx build -t devwithlando/php:8.5-apache-7 .
+
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+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
+
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
+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/*

package/node_modules/@lando/php/images/8.5-fpm/Dockerfile

@@ -0,0 +1,78 @@
+# docker buildx build -t devwithlando/php:8.5-fpm-7 .
+
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+FROM php:8.5-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 \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt -y update && apt-get install -y \
+    bzip2 \
+    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
+
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
+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/*

package/node_modules/@lando/php/netlify.toml

@@ -10,7 +10,7 @@
 [[context.deploy-preview.plugins]]
   package = "netlify-plugin-checklinks"
   [context.deploy-preview.plugins.inputs]
-    todoPatterns = [ "load", "CHANGELOG.html", "/v/", "x.com", "twitter.com", "www.php.net" ]
+    todoPatterns = [ "load", "CHANGELOG.html", "/v/", "x.com", "twitter.com", "www.php.net", "hub.docker.com" ]
     skipPatterns = [ ".rss", ".gif", ".jpg" ]
     checkExternal = true
 
@@ -40,6 +40,15 @@
     output_path = "reports/lighthouse.html"
 
 # We need this so preview environments and the base site look ok on their own
+[[redirects]]
+  from = "https://lando-php.netlify.app"
+  to = "https://lando-php.netlify.app/plugins/php/index.html"
+  status = 301
+  force = true
+[[redirects]]
+  from = "https://lando-php.netlify.app/*"
+  to = "https://docs.lando.dev/:splat"
+  status = 301
 [[redirects]]
   from = "/"
   to = "/plugins/php"

package/node_modules/@lando/php/node_modules/@lando/nginx/.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/node_modules/@lando/php/node_modules/@lando/nginx/.node-version

@@ -1 +1 @@
-18
+20