@lando/drupal 1.13.0 → 1.14.1

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
 

package/node_modules/@lando/php/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/php",
   "description": "A Lando plugin that provides a tight integration with PHP.",
-  "version": "1.8.0",
+  "version": "1.11.1",
   "author": "Mike Pirog @pirog",
   "license": "MIT",
   "repository": "lando/php",
@@ -66,9 +66,9 @@
     "semver"
   ],
   "dist": {
-    "integrity": "sha512-iacB+ZbgZlcZen5zwnsaHCluP9ZpE2hIKzFwQlzMWooXC39LeR5z1Kw6pt0BoC9a9dmmTVoYAMbf/vGwenuwBw==",
-    "shasum": "a63245f0e3fc8a4af8ce2f62cb383af253787ffd",
-    "filename": "lando-php-1.8.0.tgz",
-    "unpackedSize": 3042655
+    "integrity": "sha512-YARvLV+LsZ5LloDW2E7r3stkptHPkCtMh7VrEQu7Wa0pNF1N8TAQJlGxIRrWWuVT/6N7mgw+IWgro3CtPlCKsw==",
+    "shasum": "74c9af6bc8853760d8ca3a57528658580f99e409",
+    "filename": "lando-php-1.11.1.tgz",
+    "unpackedSize": 3059346
   }
 }

package/node_modules/@lando/php/scripts/install-db-client.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Install database client matching the detected database type/version
+# Usage: install-db-client.sh <type>:<version>
+# Examples:
+#   install-db-client.sh mysql:8.4
+#   install-db-client.sh mariadb:11.8
+
+set -e
+
+DB_CLIENT="${1:-}"
+if [[ -z "$DB_CLIENT" ]]; then
+  echo "No database client specified, keeping defaults"
+  exit 0
+fi
+
+DB_TYPE="${DB_CLIENT%%:*}"
+DB_VERSION="${DB_CLIENT##*:}"
+SCRIPTS_DIR="$(dirname "$0")"
+
+case "$DB_TYPE" in
+  mysql)
+    "$SCRIPTS_DIR/mysql-client-install.sh" "$DB_VERSION"
+    ;;
+  mariadb)
+    "$SCRIPTS_DIR/mariadb-compat-install.sh"
+    ;;
+  *)
+    echo "Unknown database type: $DB_TYPE"
+    exit 1
+    ;;
+esac

package/node_modules/@lando/php/scripts/mariadb-compat-install.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+# Usage: mariadb-compat-install.sh
+# Creates wrapper scripts to map deprecated mysql commands to mariadb equivalents
+# The mariadb-client package is already installed in the base image
+
+set -e
+
+echo "Installing MariaDB compatibility wrappers..."
+
+# Create wrapper scripts for each mysql* command that maps to mariadb* equivalent
+for cmd in mysql mysqldump mysqladmin mysqlcheck mysqlimport mysqlshow; do
+  suffix="${cmd#mysql}"
+  mariadb_cmd="mariadb${suffix:+-}${suffix}"
+
+  if command -v "$mariadb_cmd" &> /dev/null; then
+    cat > "/usr/local/bin/$cmd" << EOF
+#!/bin/bash
+exec -a "\$0" $mariadb_cmd "\$@"
+EOF
+    chmod +x "/usr/local/bin/$cmd"
+    echo "  Created wrapper: $cmd -> $mariadb_cmd"
+  fi
+done
+
+# Create config directory if it doesn't exist
+mkdir -p /etc/mysql/conf.d
+
+# Create MySQL client config with compatibility settings
+cat > /etc/mysql/conf.d/lando.cnf << 'MYCNF'
+[client]
+default-character-set=utf8mb4
+
+[client-mariadb]
+# Prevent SSL errors when connecting to servers without SSL
+disable-ssl-verify-server-cert
+
+[mysqldump]
+# MySQL 8 uses this; MariaDB safely ignores it via loose- prefix
+loose-skip-column-statistics
+MYCNF
+
+echo "MariaDB compatibility wrappers installed"

package/node_modules/@lando/php/scripts/mysql-client-install.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+# Install MySQL client from pre-downloaded binaries
+# Usage: mysql-client-install.sh <version>
+# Examples: mysql-client-install.sh 8.4, mysql-client-install.sh 8.0
+
+set -e
+
+VERSION="${1:-8.4}"
+
+echo "Installing MySQL $VERSION client..."
+
+# Map version to the closest available pre-downloaded version
+# We have 8.0 and 8.4 available
+case "$VERSION" in
+  8.4*|8.3*)
+    CLIENT_VERSION="8.4"
+    ;;
+  8.0*|8.1*|8.2*|5.7*)
+    CLIENT_VERSION="8.0"
+    ;;
+  *)
+    # Default to 8.4 for unknown versions
+    CLIENT_VERSION="8.4"
+    echo "Warning: Unknown MySQL version $VERSION, using $CLIENT_VERSION client"
+    ;;
+esac
+
+CLIENT_DIR="/usr/local/mysql-client/$CLIENT_VERSION"
+
+if [ -d "$CLIENT_DIR" ]; then
+  # Remove MariaDB client symlinks if they exist in /usr/local/bin
+  rm -f /usr/local/bin/mysql /usr/local/bin/mysqldump /usr/local/bin/mysqladmin 2>/dev/null || true
+
+  # Create symlinks to the pre-downloaded MySQL client
+  ln -sf "$CLIENT_DIR/mysql" /usr/local/bin/mysql
+  ln -sf "$CLIENT_DIR/mysqldump" /usr/local/bin/mysqldump
+  ln -sf "$CLIENT_DIR/mysqladmin" /usr/local/bin/mysqladmin
+
+  echo "MySQL $CLIENT_VERSION client activated from pre-downloaded binaries"
+else
+  echo "Warning: Pre-downloaded MySQL client not found at $CLIENT_DIR"
+  echo "Keeping default mariadb-client"
+  exit 0
+fi
+
+# Create config directory if it doesn't exist
+mkdir -p /etc/mysql/conf.d
+
+# Create MySQL client config with compatibility settings
+cat > /etc/mysql/conf.d/lando.cnf << 'MYCNF'
+[client]
+default-character-set=utf8mb4
+# Use PREFERRED so SSL is used when available but self-signed certs
+# (e.g. MySQL 5.7 defaults) don't cause verification failures.
+# Preserves SSL for servers that support it
+ssl-mode=PREFERRED
+
+[mysqldump]
+# Prevent column-statistics errors with newer mysqldump
+skip-column-statistics
+ssl-mode=PREFERRED
+MYCNF
+
+if ! mysql --version 2>/dev/null; then
+  echo "Error: MySQL client not available after activation"
+  exit 1
+fi

package/node_modules/@lando/postgres/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.6.0 - [September 8, 2025](https://github.com/lando/postgres/releases/tag/v1.6.0)
+
+* Added support for Postgres 17
+
 ## v1.5.0 - [September 1, 2025](https://github.com/lando/postgres/releases/tag/v1.5.0)
 
 * Switched images to [bitnamilegacy](https://github.com/bitnami/containers/issues/83267) namespace

package/node_modules/@lando/postgres/builders/postgres.js

@@ -11,8 +11,9 @@ module.exports = {
   name: 'postgres',
   config: {
     version: '10',
-    supported: ['16', '15', '14', '13', '12', '11', '11.1', '11.0', '10', '10.6.0', '9.6'],
+    supported: ['17', '16', '15', '14', '13', '12', '11', '11.1', '11.0', '10', '10.6.0', '9.6'],
     pinPairs: {
+      '17': 'bitnamilegacy/postgresql:17.6.0-debian-12-r4',
       '16': 'bitnamilegacy/postgresql:16.6.0-debian-12-r2',
       '15': 'bitnamilegacy/postgresql:15.10.0-debian-12-r2',
       '14': 'bitnamilegacy/postgresql:14.18.0-debian-12-r0',