@lando/drupal 1.11.0 → 1.12.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.12.0 - [January 16, 2025](https://github.com/lando/drupal/releases/tag/v1.12.0)
+
+* Updated globally installed Drush to `v8.5.0`.
+* Added docs for setting up [Drupal CMS](https://drupal.org/docs/drupal-cms).
+* Updated to [@lando/php@1.7.1](https://github.com/lando/php/releases/tag/v1.7.1).
+* Updated to [@lando/mysql@1.5.0](https://github.com/lando/mysql/releases/tag/v1.5.0).
+
 ## v1.11.0 - [December 9, 2024](https://github.com/lando/drupal/releases/tag/v1.11.0)
 
 * Optimized for `midcore`

package/builders/_drupaly.js

@@ -9,7 +9,7 @@ const utils = require('../lib/utils.js');
 const warnings = require('../lib/warnings.js');
 
 // "Constants"
-const DRUSH8 = '8.4.8';
+const DRUSH8 = '8.5.0';
 const DRUSH7 = '7.4.0';
 
 // Tooling defaults

package/builders/drupal-php.js

@@ -1,30 +1,31 @@
 'use strict';
 
-const _ = require('lodash');
-const fs = require('fs');
 const path = require('path');
 const landoPhpPath = path.join(__dirname, '../node_modules/@lando/php');
 const LandoPhp = require(`${landoPhpPath}/builders/php.js`);
 
-const loadScripts = options => {
-  const lando = _.get(options, '_app._lando');
-  // Move the script to the confDir and make executable.
-  if (fs.existsSync(path.join(landoPhpPath, 'scripts'))) {
-    const confDir = path.join(lando.config.userConfRoot, 'scripts');
-    const dest = lando.utils.moveConfig(path.join(landoPhpPath, 'scripts'), confDir);
-    lando.utils.makeExecutable(fs.readdirSync(dest), dest);
-    lando.log.debug('automoved scripts from %s to %s and set to mode 755',
-      path.join(landoPhpPath, 'scripts'), confDir);
-  }
-};
-
-// Builder
+/**
+ * Drupal PHP builder class that extends Lando PHP builder.
+ * Uses the bundled version of @lando/php plugin instead of user's version.
+ *
+ * @module drupal-php
+ */
 module.exports = {
   name: 'drupal-php',
   parent: '_appserver',
+  /**
+   * Builder function that returns the DrupalPhp class
+   * @param {Object} parent - Parent builder class
+   * @return {Class} DrupalPhp class extending LandoPhp builder
+   */
   builder: parent => class DrupalPhp extends LandoPhp.builder(parent, LandoPhp.config) {
+    /**
+     * Create a new DrupalPhp instance
+     * @param {string} id - Service id
+     * @param {Object} options - Service options
+     * @param {Object} factory - App factory instance
+     */
     constructor(id, options = {}, factory) {
-      loadScripts(options);
       options.nginxServiceType = 'drupal-nginx';
       super(id, options, factory);
     }

package/builders/drupal10.js

@@ -27,7 +27,7 @@ module.exports = {
       // Set drush to false
       options.drush = false;
 
-      // Let's make sure we set appropripate default versions for things
+      // Let's make sure we set appropriate default versions for things
       // See: https://www.drupal.org/docs/system-requirements/database-server-requirements
       if (_.get(options, 'database') === 'mysql') {
         options.database = 'mysql:5.7';

package/builders/drupal6.js

@@ -14,8 +14,9 @@ module.exports = {
     confSrc: path.resolve(__dirname, '..', 'config', 'drupal6'),
     defaultFiles: {},
     php: '5.6',
-    // @NOTE: below seems to be the last known drush version that let you do
-    // drush si -y succesfully
+    // @NOTE: below seems to be the last known Drupal 6 compatible
+    // drush version that let you do drush si -y successfully.
+    // @see https://github.com/drush-ops/drush/issues/218#issuecomment-2580619527
     drush: '8.4.5',
   },
   builder: (parent, config) => class LandoDrupal6 extends parent {

package/builders/drupal9.js

@@ -27,7 +27,7 @@ module.exports = {
       // Set drush to false
       options.drush = false;
 
-      // Let's make sure we set appropripate default versions for things
+      // Let's make sure we set appropriate default versions for things
       // See: https://www.drupal.org/docs/9/how-drupal-9-is-made-and-what-is-included/environment-requirements-of-drupal-9
       if (_.get(options, 'database') === 'mysql') {
         options.database = 'mysql:5.7';

package/netlify.toml

@@ -10,7 +10,14 @@
 [[context.deploy-preview.plugins]]
   package = "netlify-plugin-checklinks"
   [context.deploy-preview.plugins.inputs]
-    todoPatterns = [ "load", "CHANGELOG.html", "x.com", "twitter.com", "/v/" ]
+    todoPatterns = [
+      "load",
+      "CHANGELOG.html",
+      "x.com",
+      "twitter.com",
+      "https://www.drupal.org",
+      "/v/"
+    ]
     skipPatterns = [ ".rss", ".gif", ".jpg" ]
     checkExternal = true
 
@@ -40,6 +47,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-drupal.netlify.app"
+  to = "https://lando-drupal.netlify.app/plugins/drupal/index.html"
+  status = 301
+  force = true
+[[redirects]]
+  from = "https://lando-drupal.netlify.app/*"
+  to = "https://docs.lando.dev/:splat"
+  status = 301
 [[redirects]]
   from = "/"
   to = "/plugins/drupal"

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

@@ -1,5 +1,10 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.5.0 - [January 6, 2025](https://github.com/lando/mysql/releases/tag/v1.5.0)
+
+* Added support for MySQL 8.4
+* Updated 8.0 to patch 40
+
 ## v1.4.4 - [December 7, 2024](https://github.com/lando/mysql/releases/tag/v1.4.4)
 
 * Optimized for `midcore`

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

@@ -9,13 +9,13 @@ module.exports = {
   name: 'mysql',
   config: {
     version: '5.7',
-    supported: ['8.0', '5.7'],
+    supported: ['8.4', '8.0', '5.7'],
     pinPairs: {
-      '8.0': 'bitnami/mysql:8.0.39-debian-12-r5',
+      '8.4': 'bitnami/mysql:8.4.3-debian-12-r4',
+      '8.0': 'bitnami/mysql:8.0.40-debian-12-r4',
       '5.7': 'bitnami/mysql:5.7.43-debian-11-r73',
     },
     patchesSupported: true,
-    authentication: 'caching_sha2_password',
     confSrc: path.resolve(__dirname, '..', 'config'),
     creds: {
       database: 'database',

package/node_modules/@lando/mysql/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/mysql",
   "description": "A Lando plugin that provides a tight integration with MySQL.",
-  "version": "1.4.4",
+  "version": "1.5.0",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/mysql",
@@ -62,9 +62,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-b2k9E1ArWb3VNdPxxfEiEB05XCO7HtoTkf0O44E7SlPeYUfTTsBP6bPk60SJ6SJFA3V5KHl9TAPfXIhVemONtg==",
-    "shasum": "2db77cc0602dc1a32f67205a058837954250ec60",
-    "filename": "lando-mysql-1.4.4.tgz",
-    "unpackedSize": 1471119
+    "integrity": "sha512-6Vo5ldpXsUNlwXbDBLTiZKcx0H58FBJQ4Cv3+oI54MnAuUwWc0DpmHfa5eKR39wNuqxXrMXulS7igDE62FRhvQ==",
+    "shasum": "2eb72be5a0a4beeeebb6384d7913def1ddded538",
+    "filename": "lando-mysql-1.5.0.tgz",
+    "unpackedSize": 1471270
   }
 }

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

@@ -1,13 +1,41 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## 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.
+
+## v1.7.0 - [January 8, 2025](https://github.com/lando/php/releases/tag/v1.7.0)
+
+* Added logic to allow default `composer` version to be set based on PHP version.
+* Added `2.2` and `2.2-latest` shorthand options to install the latest stable 2.2 LTS version of `composer`.
+* Set default `composer` version to `2-latest`
+* Set default `composer` version to `2.2-latest` for PHP 5.3-7.2
+* Set default `composer` version to `1-latest` for PHP <= 5.2
+* Removed `composer` installation from images to prefer installing during app build
+* Fixed bug causing `composer` 2.2.x to be installed when `composer_version` was set to a single digit version such as `1`
+* Fixed mismatched `libsqlite3-dev` and `libsqlite3-0` versions in PHP 8.3 and 8.4 images
+* Fixed regression causing ImageMagick `convert` to not be available in images with `imagick` extension enabled
+
+## v1.6.4 - [December 14, 2024](https://github.com/lando/php/releases/tag/v1.6.4)
+
+* Fixed issue causing `xdebug` extension to not be disabled by default in PHP 8.3 and 8.4 images.
+* Added `install-php-extensions` script to PHP 7.4-8.2 images.
+* Added MariaDB client tools to PHP 7.4-8.4 images [#120](https://github.com/lando/php/issues/120).
+* Added `xhprof` extension to PHP 7.4-8.4 images.
+* Updated `sqlite3` to 3.45.1 in PHP 8.3-8.4 images.
+
 ## v1.6.3 - [December 7, 2024](https://github.com/lando/php/releases/tag/v1.6.3)
 
 * Optimized for `midcore`
 
 ## v1.6.2 - [December 6, 2024](https://github.com/lando/php/releases/tag/v1.6.2)
 
+* Updated PHP 8.1-8.3 base images to Debian 12 (bookworm).
+* Added `install-php-extensions` script to PHP 8.3 and 8.4 images.
+* Added `imagick` extension to PHP 8.3 and 8.4 images.
+* Updated 8.4RC image to 8.4 stable.
+* Added `xdebug` extension to PHP 8.4 images.
 * Updated the version index.md to get Docuverse page to build correctly.
-
 * Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.24](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.24).
 * Updated GitHub Actions to build images only on changes to images or workflows.
 

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,38 @@ 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();
       }
+      const usingComposer1 = options.composer_version && semver.satisfies(options.composer_version, '1.x');
 
-      // Add activate steps for xdebug
+      // 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) {
         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/*