From 910b27caf6715e4cccda930fc2705a5363022432 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Tue, 26 Nov 2024 00:26:09 -0600 Subject: [PATCH 1/7] add imagick and xdebug to 8.4 image --- images/8.4-fpm/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index b6df21d9..b7a9cb31 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -29,6 +29,7 @@ RUN \ && 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 \ @@ -43,7 +44,7 @@ RUN \ && install-php-extensions pdo_pgsql \ && install-php-extensions redis \ && install-php-extensions soap \ - # && install-php-extensions xdebug \ + && install-php-extensions xdebug \ && install-php-extensions zip RUN install-php-extensions @composer-2 From 8cfada7861bf168265cddfb530c9960f746f3821 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Tue, 26 Nov 2024 00:50:32 -0600 Subject: [PATCH 2/7] use xdebug beta for now --- CHANGELOG.md | 3 +++ images/8.4-apache/Dockerfile | 5 ++++- images/8.4-fpm/Dockerfile | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cef807e8..926b7322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) +* Updated 8.4RC image to 8.4 stable. +* Added `xdebug-beta` and `imagick` extension to PHP 8.4 images. + ## v1.6.3 - [December 7, 2024](https://github.com/lando/php/releases/tag/v1.6.3) * Optimized for `midcore` diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile index ca90794c..f80701d5 100644 --- a/images/8.4-apache/Dockerfile +++ b/images/8.4-apache/Dockerfile @@ -28,6 +28,7 @@ RUN \ && 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 \ @@ -42,7 +43,9 @@ RUN \ && install-php-extensions pdo_pgsql \ && install-php-extensions redis \ && install-php-extensions soap \ - # && install-php-extensions xdebug \ + # TODO: switch to xdebug once there is a stable release for PHP 8.4 + && install-php-extensions xdebug-beta \ + # install-php-extensions xdebug \ && install-php-extensions zip RUN install-php-extensions @composer-2 diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index b7a9cb31..31dc8fbd 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -44,7 +44,9 @@ RUN \ && install-php-extensions pdo_pgsql \ && install-php-extensions redis \ && install-php-extensions soap \ - && install-php-extensions xdebug \ + # TODO: switch to xdebug once there is a stable release for PHP 8.4 + && install-php-extensions xdebug-beta \ + # install-php-extensions xdebug \ && install-php-extensions zip RUN install-php-extensions @composer-2 From a0042936a4d626b56b1992fb52a3cedddc2e0dfd Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Wed, 4 Dec 2024 13:10:46 -0600 Subject: [PATCH 3/7] xdebug support for 8.4 is stable --- images/8.4-apache/Dockerfile | 4 +--- images/8.4-fpm/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile index f80701d5..7065563b 100644 --- a/images/8.4-apache/Dockerfile +++ b/images/8.4-apache/Dockerfile @@ -43,9 +43,7 @@ RUN \ && install-php-extensions pdo_pgsql \ && install-php-extensions redis \ && install-php-extensions soap \ - # TODO: switch to xdebug once there is a stable release for PHP 8.4 - && install-php-extensions xdebug-beta \ - # install-php-extensions xdebug \ + && install-php-extensions xdebug \ && install-php-extensions zip RUN install-php-extensions @composer-2 diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index 31dc8fbd..b7a9cb31 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -44,9 +44,7 @@ RUN \ && install-php-extensions pdo_pgsql \ && install-php-extensions redis \ && install-php-extensions soap \ - # TODO: switch to xdebug once there is a stable release for PHP 8.4 - && install-php-extensions xdebug-beta \ - # install-php-extensions xdebug \ + && install-php-extensions xdebug \ && install-php-extensions zip RUN install-php-extensions @composer-2 From 86f5c67be6a31667fe76a292425835a6168a873c Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Wed, 4 Dec 2024 13:32:47 -0600 Subject: [PATCH 4/7] add xhprof --- CHANGELOG.md | 4 +++- docs/extensions.md | 17 +++++++---------- images/7.4-apache/Dockerfile | 1 + images/7.4-fpm/Dockerfile | 1 + images/8.0-apache/Dockerfile | 1 + images/8.0-fpm/Dockerfile | 1 + images/8.1-apache/Dockerfile | 1 + images/8.1-fpm/Dockerfile | 1 + images/8.2-apache/Dockerfile | 1 + images/8.2-fpm/Dockerfile | 1 + images/8.3-apache/Dockerfile | 1 + images/8.3-fpm/Dockerfile | 1 + images/8.4-apache/Dockerfile | 1 + images/8.4-fpm/Dockerfile | 1 + 14 files changed, 22 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 926b7322..746e15df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) * Updated 8.4RC image to 8.4 stable. -* Added `xdebug-beta` and `imagick` extension to PHP 8.4 images. +* Added `xdebug` and `imagick` extension to PHP 8.4 images. +* Added `xhprof` extension to PHP 7.4+ images. +* Added `imagick` extension to PHP 8.3 images. ## v1.6.3 - [December 7, 2024](https://github.com/lando/php/releases/tag/v1.6.3) diff --git a/docs/extensions.md b/docs/extensions.md index 134d51c9..cf417421 100644 --- a/docs/extensions.md +++ b/docs/extensions.md @@ -8,7 +8,7 @@ description: Learn what extensions are installed in the Lando PHP plugin | | 5.3 | 5.4 | 5.5 | 5.6 | 7.0 | 7.1 | 7.2 | 7.3 | 7.4 | 8.0 | 8.1 | 8.2 | 8.3 | 8.4 | | -- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | | apc | X | X | | | | | | | | | | | | | -| apcu | | | X | X | X | X | X | X | X | | | | | X | +| apcu | | | X | X | X | X | X | X | X | X | X | X | X | X | | bcmath | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | bz2 | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | calendar | X | X | X | X | X | X | X | X | X | X | X | X | X | X | @@ -25,7 +25,7 @@ description: Learn what extensions are installed in the Lando PHP plugin | gettext | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | hash | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | iconv | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| imagick | X | X | X | X | X | X | X | X | X | X | X | X | * | | +| imagick | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | imap | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | intl | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | json | X | X | X | X | X | X | X | X | X | X | X | X | X | X | @@ -33,10 +33,10 @@ description: Learn what extensions are installed in the Lando PHP plugin | libxml | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | mbstring | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | mcrypt | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| memcached | X | X | X | X | X | X | X | X | X | | | | | X | +| memcached | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | mysqli | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | mysqlnd | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| OAuth | X | X | X | X | X | X | X | X | X | | | | | X | +| OAuth | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | OPcache | | | X | X | X | X | X | X | X | X | X | X | X | X | | openssl | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | pcntl | X | X | X | X | X | X | X | X | X | X | X | X | X | X | @@ -58,18 +58,15 @@ description: Learn what extensions are installed in the Lando PHP plugin | sqlite3 | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | standard | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | tokenizer | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| xdebug | | | | | | | | | | | | | | | +| xdebug | * | * | * | * | * | * | * | * | * | * | * | * | * | * | +| xhprof | | | | | | | | | X | X | X | X | X | X | | xml | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | xmlreader | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | xmlwriter | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | zip | X | X | X | X | X | X | X | X | X | X | X | X | X | X | | zlib | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -Note that `xdebug` is off by default but you can enable it by setting your `php` services config to `xdebug: true`. Read more about this in "Configuration" above. - -::: warning -Note that imagick is temporarily unavailable on PHP 8.3/8.4, due to a pending issue waiting to get released on the imagick project: https://github.com/Imagick/imagick/pull/641 -::: +__*__ Note that `xdebug` is off by default but you can enable it by setting your `php` services config to `xdebug: true`. Read more about this in "Configuration" above. ## Adding or removing extensions diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile index 27ab36ea..ccc11586 100644 --- a/images/7.4-apache/Dockerfile +++ b/images/7.4-apache/Dockerfile @@ -42,6 +42,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && pecl install oauth-2.0.4 \ && pecl install redis-5.1.1 \ && pecl install xdebug-3.1.6 \ + && pecl install xhprof \ && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ && docker-php-ext-enable apcu \ && docker-php-ext-enable imagick \ diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile index 7b8d84d8..8118a7e9 100644 --- a/images/7.4-fpm/Dockerfile +++ b/images/7.4-fpm/Dockerfile @@ -42,6 +42,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && pecl install oauth-2.0.4 \ && pecl install redis-5.1.1 \ && pecl install xdebug-3.1.6 \ + && pecl install xhprof \ && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ && docker-php-ext-enable apcu \ && docker-php-ext-enable imagick \ diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile index c708282e..92f9f068 100644 --- a/images/8.0-apache/Dockerfile +++ b/images/8.0-apache/Dockerfile @@ -43,6 +43,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && pecl install oauth \ && pecl install redis-5.3.2 \ && pecl install xdebug \ + && pecl install xhprof \ && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ && docker-php-ext-enable apcu \ && docker-php-ext-enable imagick \ diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile index 47839cf3..da24c1af 100644 --- a/images/8.0-fpm/Dockerfile +++ b/images/8.0-fpm/Dockerfile @@ -43,6 +43,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && pecl install oauth \ && pecl install redis-5.3.2 \ && pecl install xdebug \ + && pecl install xhprof \ && docker-php-ext-configure ldap --with-libdir=lib/$(uname -m)-linux-gnu/ \ && docker-php-ext-enable apcu \ && docker-php-ext-enable imagick \ diff --git a/images/8.1-apache/Dockerfile b/images/8.1-apache/Dockerfile index 17d23316..6161c279 100644 --- a/images/8.1-apache/Dockerfile +++ b/images/8.1-apache/Dockerfile @@ -44,6 +44,7 @@ RUN \ && install-php-extensions redis \ && install-php-extensions soap \ && install-php-extensions xdebug \ + && install-php-extensions xhprof \ && install-php-extensions zip RUN install-php-extensions @composer-2 diff --git a/images/8.1-fpm/Dockerfile b/images/8.1-fpm/Dockerfile index 520e882d..1365d45a 100644 --- a/images/8.1-fpm/Dockerfile +++ b/images/8.1-fpm/Dockerfile @@ -44,6 +44,7 @@ RUN \ && install-php-extensions redis \ && install-php-extensions soap \ && install-php-extensions xdebug \ + && install-php-extensions xhprof \ && install-php-extensions zip RUN install-php-extensions @composer-2 diff --git a/images/8.2-apache/Dockerfile b/images/8.2-apache/Dockerfile index 34443096..1495dc9e 100644 --- a/images/8.2-apache/Dockerfile +++ b/images/8.2-apache/Dockerfile @@ -44,6 +44,7 @@ RUN \ && install-php-extensions redis \ && install-php-extensions soap \ && install-php-extensions xdebug \ + && install-php-extensions xhprof \ && install-php-extensions zip RUN install-php-extensions @composer-2 diff --git a/images/8.2-fpm/Dockerfile b/images/8.2-fpm/Dockerfile index 1b082e2d..285514ee 100644 --- a/images/8.2-fpm/Dockerfile +++ b/images/8.2-fpm/Dockerfile @@ -44,6 +44,7 @@ RUN \ && install-php-extensions redis \ && install-php-extensions soap \ && install-php-extensions xdebug \ + && install-php-extensions xhprof \ && install-php-extensions zip RUN install-php-extensions @composer-2 diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile index 2b932065..4102af5a 100644 --- a/images/8.3-apache/Dockerfile +++ b/images/8.3-apache/Dockerfile @@ -44,6 +44,7 @@ RUN \ && install-php-extensions redis \ && install-php-extensions soap \ && install-php-extensions xdebug \ + && install-php-extensions xhprof \ && install-php-extensions zip RUN install-php-extensions @composer-2 diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile index daab20bd..5f0f742a 100644 --- a/images/8.3-fpm/Dockerfile +++ b/images/8.3-fpm/Dockerfile @@ -44,6 +44,7 @@ RUN \ && install-php-extensions redis \ && install-php-extensions soap \ && install-php-extensions xdebug \ + && install-php-extensions xhprof \ && install-php-extensions zip RUN install-php-extensions @composer-2 diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile index 7065563b..f7a2a3da 100644 --- a/images/8.4-apache/Dockerfile +++ b/images/8.4-apache/Dockerfile @@ -44,6 +44,7 @@ RUN \ && install-php-extensions redis \ && install-php-extensions soap \ && install-php-extensions xdebug \ + && install-php-extensions xhprof \ && install-php-extensions zip RUN install-php-extensions @composer-2 diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index b7a9cb31..dc695aed 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -45,6 +45,7 @@ RUN \ && install-php-extensions redis \ && install-php-extensions soap \ && install-php-extensions xdebug \ + && install-php-extensions xhprof \ && install-php-extensions zip RUN install-php-extensions @composer-2 From ce4d7731c9c76babba1acdcabb3f288ca9b9dc97 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Sun, 8 Dec 2024 13:34:22 -0600 Subject: [PATCH 5/7] Use install-php-extensions in 7.4+ images --- images/7.4-apache/Dockerfile | 94 +++++++++++---------------- images/7.4-fpm/Dockerfile | 120 +++++++++++++++-------------------- images/8.0-apache/Dockerfile | 95 +++++++++++---------------- images/8.0-fpm/Dockerfile | 95 +++++++++++---------------- 4 files changed, 161 insertions(+), 243 deletions(-) diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile index ccc11586..c6044b8f 100644 --- a/images/7.4-apache/Dockerfile +++ b/images/7.4-apache/Dockerfile @@ -2,29 +2,14 @@ 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 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 \ @@ -34,46 +19,41 @@ 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 \ - && pecl install xhprof \ - && 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 xdebug \ + && install-php-extensions xhprof \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2.2.12 + +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/* diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile index 8118a7e9..487c4ecc 100644 --- a/images/7.4-fpm/Dockerfile +++ b/images/7.4-fpm/Dockerfile @@ -2,78 +2,58 @@ 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 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 \ - && pecl install xhprof \ - && 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 \ + libonig-dev \ + 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 xdebug \ + && install-php-extensions xhprof \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2.2.12 + +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/* diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile index 92f9f068..8482e434 100644 --- a/images/8.0-apache/Dockerfile +++ b/images/8.0-apache/Dockerfile @@ -2,30 +2,14 @@ FROM php:8.0-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 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 \ - libfreetype6-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 \ @@ -35,46 +19,41 @@ 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 \ - && pecl install redis-5.3.2 \ - && pecl install xdebug \ - && pecl install xhprof \ - && 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 xdebug \ + && install-php-extensions xhprof \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2 + +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-jpeg --with-webp --with-freetype \ - && 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/* diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile index da24c1af..20aa57ca 100644 --- a/images/8.0-fpm/Dockerfile +++ b/images/8.0-fpm/Dockerfile @@ -2,30 +2,14 @@ FROM php:8.0-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 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 \ - libfreetype6-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 \ @@ -35,46 +19,41 @@ 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 \ - && pecl install redis-5.3.2 \ - && pecl install xdebug \ - && pecl install xhprof \ - && 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 xdebug \ + && install-php-extensions xhprof \ + && install-php-extensions zip + +RUN install-php-extensions @composer-2 + +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-jpeg --with-webp --with-freetype \ - && 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/* From 8bf3ff931176c0187f3b83b2a0906dbc26a2ddc3 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Sun, 8 Dec 2024 16:00:55 -0600 Subject: [PATCH 6/7] Add mariadb client Resolves #120 --- CHANGELOG.md | 3 ++- images/7.4-apache/Dockerfile | 7 +++++++ images/7.4-fpm/Dockerfile | 7 +++++++ images/8.0-apache/Dockerfile | 7 +++++++ images/8.0-fpm/Dockerfile | 7 +++++++ images/8.1-apache/Dockerfile | 7 +++++++ images/8.1-fpm/Dockerfile | 7 +++++++ images/8.2-apache/Dockerfile | 7 +++++++ images/8.2-fpm/Dockerfile | 7 +++++++ images/8.3-apache/Dockerfile | 6 ++++++ images/8.3-fpm/Dockerfile | 7 +++++++ images/8.4-apache/Dockerfile | 8 ++++++++ images/8.4-fpm/Dockerfile | 8 ++++++++ 13 files changed, 87 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 746e15df..e28d9f31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) * Updated 8.4RC image to 8.4 stable. +* Added MariaDB client tools to PHP 7.4-8.4 images [#120](https://github.com/lando/php/issues/120). * Added `xdebug` and `imagick` extension to PHP 8.4 images. -* Added `xhprof` extension to PHP 7.4+ images. +* Added `xhprof` extension to PHP 7.4-8.4 images. * Added `imagick` extension to PHP 8.3 images. ## v1.6.3 - [December 7, 2024](https://github.com/lando/php/releases/tag/v1.6.3) diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile index c6044b8f..5f7b33a6 100644 --- a/images/7.4-apache/Dockerfile +++ b/images/7.4-apache/Dockerfile @@ -4,6 +4,12 @@ FROM php:7.4-apache-bullseye 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 \ default-mysql-client \ @@ -11,6 +17,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ git-core \ gnupg2 \ libonig-dev \ + mariadb-client \ openssl \ postgresql-client-13 \ pv \ diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile index 487c4ecc..6b1f7821 100644 --- a/images/7.4-fpm/Dockerfile +++ b/images/7.4-fpm/Dockerfile @@ -4,6 +4,12 @@ FROM php:7.4-fpm-bullseye 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 \ default-mysql-client \ @@ -11,6 +17,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ git-core \ gnupg2 \ libonig-dev \ + mariadb-client \ openssl \ postgresql-client-13 \ pv \ diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile index 8482e434..9398b5d4 100644 --- a/images/8.0-apache/Dockerfile +++ b/images/8.0-apache/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.0-apache-bullseye 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 \ default-mysql-client \ @@ -11,6 +17,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ git-core \ gnupg2 \ libonig-dev \ + mariadb-client \ openssl \ postgresql-client-13 \ pv \ diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile index 20aa57ca..7979de37 100644 --- a/images/8.0-fpm/Dockerfile +++ b/images/8.0-fpm/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.0-fpm-bullseye 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 \ default-mysql-client \ @@ -11,6 +17,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ git-core \ gnupg2 \ libonig-dev \ + mariadb-client \ openssl \ postgresql-client-13 \ pv \ diff --git a/images/8.1-apache/Dockerfile b/images/8.1-apache/Dockerfile index 6161c279..f65b5bbe 100644 --- a/images/8.1-apache/Dockerfile +++ b/images/8.1-apache/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.1-apache-bookworm 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 + RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ @@ -11,6 +17,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ + mariadb-client \ openssl \ postgresql-client-15 \ pv \ diff --git a/images/8.1-fpm/Dockerfile b/images/8.1-fpm/Dockerfile index 1365d45a..4600e43f 100644 --- a/images/8.1-fpm/Dockerfile +++ b/images/8.1-fpm/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.1-fpm-bookworm 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 + RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ @@ -11,6 +17,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ + mariadb-client \ openssl \ postgresql-client-15 \ pv \ diff --git a/images/8.2-apache/Dockerfile b/images/8.2-apache/Dockerfile index 1495dc9e..d2cbc060 100644 --- a/images/8.2-apache/Dockerfile +++ b/images/8.2-apache/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.2-apache-bookworm 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 + RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ @@ -11,6 +17,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ + mariadb-client \ openssl \ postgresql-client-15 \ pv \ diff --git a/images/8.2-fpm/Dockerfile b/images/8.2-fpm/Dockerfile index 285514ee..faba7699 100644 --- a/images/8.2-fpm/Dockerfile +++ b/images/8.2-fpm/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.2-fpm-bookworm 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 + RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ @@ -11,6 +17,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ + mariadb-client \ openssl \ postgresql-client-15 \ pv \ diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile index 4102af5a..1ea1c274 100644 --- a/images/8.3-apache/Dockerfile +++ b/images/8.3-apache/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.3-apache-bookworm 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 + RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile index 5f0f742a..3569bc8e 100644 --- a/images/8.3-fpm/Dockerfile +++ b/images/8.3-fpm/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.3-fpm-bookworm 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 + RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ @@ -11,6 +17,7 @@ RUN \ exiftool \ git-core \ gnupg2 \ + mariadb-client \ openssl \ postgresql-client-15 \ pv \ diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile index f7a2a3da..51986439 100644 --- a/images/8.4-apache/Dockerfile +++ b/images/8.4-apache/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.4-apache-bookworm 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 + RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ @@ -11,6 +17,8 @@ RUN \ exiftool \ git-core \ gnupg2 \ + mariadb-client \ + mariadb-client-compat \ openssl \ postgresql-client-15 \ pv \ diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index dc695aed..aa7ccbb6 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -4,6 +4,12 @@ FROM php:8.4-fpm-bookworm 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 + RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ @@ -12,6 +18,8 @@ RUN \ exiftool \ git-core \ gnupg2 \ + mariadb-client \ + mariadb-client-compat \ openssl \ postgresql-client-15 \ pv \ From 591df7cc486547190dc2b187a1a7cef5370ab876 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Sun, 8 Dec 2024 18:18:46 -0600 Subject: [PATCH 7/7] update sqlite version to 3.45.1 Resolves lando/drupal#119 --- CHANGELOG.md | 1 + images/8.3-apache/Dockerfile | 9 +++++++++ images/8.3-fpm/Dockerfile | 9 +++++++++ images/8.4-apache/Dockerfile | 9 +++++++++ images/8.4-fpm/Dockerfile | 11 ++++++++++- 5 files changed, 38 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e28d9f31..5bcdd961 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Added `xdebug` and `imagick` extension to PHP 8.4 images. * Added `xhprof` extension to PHP 7.4-8.4 images. * Added `imagick` extension to PHP 8.3 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) diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile index 1ea1c274..1394be17 100644 --- a/images/8.3-apache/Dockerfile +++ b/images/8.3-apache/Dockerfile @@ -2,6 +2,8 @@ FROM php:8.3-apache-bookworm +ARG TARGETARCH + ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ RUN \ @@ -55,6 +57,13 @@ RUN \ RUN install-php-extensions @composer-2 +# 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" \ + && dpkg -i /tmp/sqlite3.deb /tmp/libsqlite3-0.deb + RUN \ chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \ diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile index 3569bc8e..11f11fcb 100644 --- a/images/8.3-fpm/Dockerfile +++ b/images/8.3-fpm/Dockerfile @@ -2,6 +2,8 @@ FROM php:8.3-fpm-bookworm +ARG TARGETARCH + ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ RUN \ @@ -56,6 +58,13 @@ RUN \ RUN install-php-extensions @composer-2 +# 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" \ + && dpkg -i /tmp/sqlite3.deb /tmp/libsqlite3-0.deb + RUN \ chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \ diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile index 51986439..4d0000d0 100644 --- a/images/8.4-apache/Dockerfile +++ b/images/8.4-apache/Dockerfile @@ -2,6 +2,8 @@ FROM php:8.4-apache-bookworm +ARG TARGETARCH + ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ RUN \ @@ -57,6 +59,13 @@ RUN \ RUN install-php-extensions @composer-2 +# 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" \ + && dpkg -i /tmp/sqlite3.deb /tmp/libsqlite3-0.deb + RUN \ chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \ diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index aa7ccbb6..39dfa2df 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -2,13 +2,15 @@ FROM php:8.4-fpm-bookworm +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 + && 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 RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ @@ -58,6 +60,13 @@ RUN \ RUN install-php-extensions @composer-2 +# 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" \ + && dpkg -i /tmp/sqlite3.deb /tmp/libsqlite3-0.deb + RUN \ chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \ && apt-get -y clean \