@lando/wordpress 1.8.0 → 1.9.0

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

@@ -5,6 +5,29 @@ const _ = require('lodash');
 const path = require('path');
 const semver = require('semver');
 const addBuildStep = require('./../utils/add-build-step');
+
+/**
+ * Get the appropriate Composer version based on the PHP version.
+ * @param {semver} phpSemver - The PHP semantic version.
+ * @return {string|boolean} - The Composer version or false if we cannot parse the version.
+ */
+const getDefaultComposerVersion = phpSemver => {
+  // Don't set a default composer version if we cannot
+  // parse the version such as with `custom`.
+  if (!phpSemver) return false;
+
+  if (semver.lt(phpSemver, '5.3.2')) {
+    // Use Composer 1 for PHP < 5.3.2
+    return '1';
+  } else if (semver.lt(phpSemver, '7.3.0')) {
+    // Use Composer 2.2 LTS for PHP < 7.3
+    return '2.2';
+  } else {
+    // Use Composer 2 for PHP >= 7.3
+    return '2';
+  }
+};
+
 /*
  * Helper to get nginx config
  */
@@ -30,13 +53,25 @@ const nginxConfig = options => ({
 const xdebugConfig = host => ([
   `client_host=${host}`,
   'discover_client_host=1',
- 'log=/tmp/xdebug.log',
- 'remote_enable=true',
+  'log=/tmp/xdebug.log',
+  'remote_enable=true',
   `remote_host=${host}`,
 ].join(' '));
 
-/*
- * Helper to build a package string
+/**
+ * Helper function to build a package string by combining package name and version
+ *
+ * @param {string} pkg - The package name
+ * @param {string} version - The package version
+ * @return {string} The formatted package string, either "pkg:version" or just "pkg" if version is empty
+ *
+ * @example
+ * // Returns "php:7.4"
+ * pkger('php', '7.4');
+ *
+ * @example
+ * // Returns "mysql"
+ * pkger('mysql', '');
  */
 const pkger = (pkg, version) => (!_.isEmpty(version)) ? `${pkg}:${version}` : pkg;
 
@@ -108,7 +143,7 @@ module.exports = {
     ],
     confSrc: path.resolve(__dirname, '..', 'config'),
     command: ['sh -c \'a2enmod rewrite && apache2-foreground\''],
-    composer_version: '2.2.22',
+    composer_version: true,
     phpServer: 'apache',
     defaultFiles: {
       _php: 'php.ini',
@@ -126,6 +161,7 @@ module.exports = {
       php: '/usr/local/etc/php/conf.d/zzz-lando-my-custom.ini',
       pool: '/usr/local/etc/php-fpm.d/zz-lando.conf',
     },
+    scriptsDir: path.resolve(__dirname, '..', 'scripts'),
     sources: [],
     suffix: '5',
     ssl: false,
@@ -137,12 +173,20 @@ module.exports = {
   parent: '_appserver',
   builder: (parent, config) => class LandoPhp extends parent {
     constructor(id, options = {}, factory) {
+      const debug = _.get(options, '_app._lando').log.debug;
+
+      // Merge the user config onto the default options
       options = parseConfig(_.merge({}, config, options));
+
+      // Get the semver of the PHP version, NULL if we cannot parse it
+      const phpSemver = semver.coerce(options.version);
+      phpSemver && debug('Parsed PHP semantic version: %s', phpSemver);
+
       // Mount our default php config
       options.volumes.push(`${options.confDest}/${options.defaultFiles._php}:${options.remoteFiles._php}`);
       options.volumes.push(`${options.confDest}/${options.defaultFiles.pool}:${options.remoteFiles.pool}`);
       // Shift on the docker entrypoint if this is a more recent version
-      if (options.version !== 'custom' && semver.gt(semver.coerce(options.version), '5.5.0')) {
+      if (phpSemver && semver.gt(phpSemver, '5.5.0')) {
         options.command.unshift('docker-php-entrypoint');
       }
 
@@ -168,22 +212,31 @@ module.exports = {
       };
       options.info = {via: options.via};
 
-      // Add our composer things to run step
-      if (!_.isEmpty(options.composer)) {
-        const commands =
-          require('../utils/get-install-commands')(options.composer, pkger, ['composer', 'global', 'require', '-n']);
-        addBuildStep(commands, options._app, options.name, 'build_internal');
+      // Determine the appropriate composer version to install if not specified
+      if (options.composer_version === true || options.composer_version === '') {
+        options.composer_version = getDefaultComposerVersion(phpSemver);
+      } else if (typeof options.composer_version === 'number') {
+        options.composer_version = options.composer_version.toString();
       }
 
-      // Add activate steps for xdebug
+      // Add build step to enable xdebug
       if (options.xdebug) {
         addBuildStep(['docker-php-ext-enable xdebug'], options._app, options.name, 'build_as_root_internal');
       }
 
-      // Install the desired composer version
+      // Add build step to install our Composer global packages
+      if (!_.isEmpty(options.composer)) {
+        const commands =
+          require('../utils/get-install-commands')(options.composer, pkger, ['composer', 'global', 'require', '-n']);
+        addBuildStep(commands, options._app, options.name, 'build_internal');
+      }
+
+      // Install the desired composer version as the first `build_internal` build step
       if (options.composer_version) {
-        const commands = [`/helpers/install-composer.sh ${options.composer_version}`];
-        addBuildStep(commands, options._app, options.name, 'build_internal', true);
+        debug('Installing composer version %s', options.composer_version);
+        const commands = [`/etc/lando/service/helpers/install-composer.sh ${options.composer_version}`];
+        const firstStep = true;
+        addBuildStep(commands, options._app, options.name, 'build_internal', firstStep);
       }
 
       // Add in nginx if we need to

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

@@ -72,11 +72,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -72,12 +72,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  # Install composer
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -72,11 +72,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -72,11 +72,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -75,11 +75,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -75,11 +75,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -73,11 +73,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -73,11 +73,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -69,9 +69,6 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
-  && php -r "unlink('composer-setup.php');" \
   && 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 \

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

@@ -69,9 +69,6 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
-  && php -r "unlink('composer-setup.php');" \
   && 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 \

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

@@ -2,30 +2,23 @@
 
 FROM php:7.4-apache-bullseye
 
-# Install dependencies we need
+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.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 \
-    bzip2 \
     default-mysql-client \
     exiftool \
     git-core \
     gnupg2 \
     imagemagick \
-    libbz2-dev \
-    libc-client-dev \
-    libicu-dev \
-    libjpeg62-turbo-dev \
-    libkrb5-dev \
-    libldap2-dev \
-    libmagickwand-dev \
-    libmemcached-dev \
-    libpng-dev \
-    libpq-dev \
-    libssl-dev \
-    libwebp-dev \
-    libxml2-dev \
-    libzip-dev \
     libonig-dev \
+    mariadb-client \
     openssl \
     postgresql-client-13 \
     pv \
@@ -34,45 +27,42 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
     unzip \
     wget \
     xfonts-75dpi \
-    xfonts-base \
-    zlib1g-dev \
-  && pecl install apcu \
-  && pecl install imagick \
-  && pecl install memcached \
-  && pecl install oauth-2.0.4 \
-  && pecl install redis-5.1.1 \
-  && pecl install xdebug-3.1.6 \
-  && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \
-  && docker-php-ext-enable apcu \
-  && docker-php-ext-enable imagick \
-  && docker-php-ext-enable memcached \
-  && docker-php-ext-enable oauth \
-  && docker-php-ext-enable redis \
-  && docker-php-ext-install bcmath \
-  && docker-php-ext-install bz2 \
-  && docker-php-ext-install calendar \
-  && docker-php-ext-install exif \
-  && docker-php-ext-install gettext \
-  && docker-php-ext-install intl \
-  && docker-php-ext-install ldap \
-  && docker-php-ext-install mbstring \
-  && docker-php-ext-install mysqli \
-  && docker-php-ext-install opcache \
-  && docker-php-ext-install pcntl \
-  && docker-php-ext-install pdo \
-  && docker-php-ext-install pdo_mysql \
-  && docker-php-ext-install pdo_pgsql \
-  && docker-php-ext-install soap \
-  && docker-php-ext-install zip \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
-  && php -r "unlink('composer-setup.php');" \
-  && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
+    xfonts-base
+
+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 \
+  && 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 \
+  && 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/* \
-  && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-  && docker-php-ext-install imap \
-  && docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp \
-  && docker-php-ext-install gd
+  && 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/7.4-fpm/Dockerfile

@@ -2,77 +2,67 @@
 
 FROM php:7.4-fpm-bullseye
 
-# Install dependencies we need
+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.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 \
-    bzip2 \
-    default-mysql-client \
-    exiftool \
-    git-core \
-    gnupg2 \
-    imagemagick \
-    libbz2-dev \
-    libc-client-dev \
-    libicu-dev \
-    libjpeg62-turbo-dev \
-    libkrb5-dev \
-    libldap2-dev \
-    libmagickwand-dev \
-    libmemcached-dev \
-    libpng-dev \
-    libpq-dev \
-    libssl-dev \
-    libwebp-dev \
-    libxml2-dev \
-    libzip-dev \
-    libonig-dev \
-    openssl \
-    postgresql-client-13 \
-    pv \
-    rsync \
-    ssh \
-    unzip \
-    wget \
-    xfonts-75dpi \
-    xfonts-base \
-    zlib1g-dev \
-  && pecl install apcu \
-  && pecl install imagick \
-  && pecl install memcached \
-  && pecl install oauth-2.0.4 \
-  && pecl install redis-5.1.1 \
-  && pecl install xdebug-3.1.6 \
-  && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \
-  && docker-php-ext-enable apcu \
-  && docker-php-ext-enable imagick \
-  && docker-php-ext-enable memcached \
-  && docker-php-ext-enable oauth \
-  && docker-php-ext-enable redis \
-  && docker-php-ext-install bcmath \
-  && docker-php-ext-install bz2 \
-  && docker-php-ext-install calendar \
-  && docker-php-ext-install exif \
-  && docker-php-ext-install gettext \
-  && docker-php-ext-install intl \
-  && docker-php-ext-install ldap \
-  && docker-php-ext-install mbstring \
-  && docker-php-ext-install mysqli \
-  && docker-php-ext-install opcache \
-  && docker-php-ext-install pcntl \
-  && docker-php-ext-install pdo \
-  && docker-php-ext-install pdo_mysql \
-  && docker-php-ext-install pdo_pgsql \
-  && docker-php-ext-install soap \
-  && docker-php-ext-install zip \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.2.12 \
-  && php -r "unlink('composer-setup.php');" \
-  && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
+  default-mysql-client \
+  exiftool \
+  git-core \
+  gnupg2 \
+  imagemagick \
+  libonig-dev \
+  mariadb-client \
+  openssl \
+  postgresql-client-13 \
+  pv \
+  rsync \
+  ssh \
+  unzip \
+  wget \
+  xfonts-75dpi \
+  xfonts-base
+
+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 \
+  && 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 \
+  && 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/* \
-  && PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
-  && docker-php-ext-install imap \
-  && docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp \
-  && docker-php-ext-install gd
+  && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/*