From ace4bbd058177c4a9e2fcdf603f91d8e45985d92 Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Fri, 22 Oct 2021 09:01:29 -0700 Subject: [PATCH 1/2] Re-add default extensions to PHP 8.0 services --- .../services/php/8.0-apache/Dockerfile | 22 +++++++++---------- .../services/php/8.0-fpm/Dockerfile | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/plugins/lando-services/services/php/8.0-apache/Dockerfile b/plugins/lando-services/services/php/8.0-apache/Dockerfile index fdb64d7f8..529001e8b 100644 --- a/plugins/lando-services/services/php/8.0-apache/Dockerfile +++ b/plugins/lando-services/services/php/8.0-apache/Dockerfile @@ -14,7 +14,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ default-mysql-client \ exiftool \ git-core \ - #imagemagick \ + imagemagick \ libbz2-dev \ libc-client-dev \ libfreetype6-dev \ @@ -22,8 +22,8 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ - #libmagickwand-dev \ - #libmemcached-dev \ + libmagickwand-dev \ + libmemcached-dev \ libpng-dev \ libpq-dev \ libssl-dev \ @@ -41,17 +41,17 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ xfonts-75dpi \ xfonts-base \ zlib1g-dev \ - #&& pecl install apcu \ - #&& pecl install imagick \ - #&& pecl install memcached \ - #&& pecl install oauth-2.0.4 \ + && pecl install apcu \ + && pecl install imagick \ + && pecl install memcached \ + && pecl install oauth \ && pecl install redis-5.3.2 \ && pecl install xdebug \ && 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 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 \ diff --git a/plugins/lando-services/services/php/8.0-fpm/Dockerfile b/plugins/lando-services/services/php/8.0-fpm/Dockerfile index 5d4f28270..33b0a88c3 100644 --- a/plugins/lando-services/services/php/8.0-fpm/Dockerfile +++ b/plugins/lando-services/services/php/8.0-fpm/Dockerfile @@ -14,7 +14,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ default-mysql-client \ exiftool \ git-core \ - #imagemagick \ + imagemagick \ libbz2-dev \ libc-client-dev \ libfreetype6-dev \ @@ -22,8 +22,8 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ - #libmagickwand-dev \ - #libmemcached-dev \ + libmagickwand-dev \ + libmemcached-dev \ libpng-dev \ libpq-dev \ libssl-dev \ @@ -41,17 +41,17 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ xfonts-75dpi \ xfonts-base \ zlib1g-dev \ - #&& pecl install apcu \ - #&& pecl install imagick \ - #&& pecl install memcached \ - #&& pecl install oauth-2.0.4 \ + && pecl install apcu \ + && pecl install imagick \ + && pecl install memcached \ + && pecl install oauth \ && pecl install redis-5.3.2 \ && pecl install xdebug \ && 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 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 \ From 8852578ac95d72d560e539bdf3fce17cb9087403 Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Sun, 12 Dec 2021 14:03:55 -0500 Subject: [PATCH 2/2] Re-add default extensions to PHP 8.1 services --- .../services/php/8.1-apache/Dockerfile | 22 +++++++++---------- .../services/php/8.1-fpm/Dockerfile | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/plugins/lando-services/services/php/8.1-apache/Dockerfile b/plugins/lando-services/services/php/8.1-apache/Dockerfile index 5ea5a5687..2d6866ecb 100644 --- a/plugins/lando-services/services/php/8.1-apache/Dockerfile +++ b/plugins/lando-services/services/php/8.1-apache/Dockerfile @@ -14,7 +14,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ default-mysql-client \ exiftool \ git-core \ - #imagemagick \ + imagemagick \ libbz2-dev \ libc-client-dev \ libfreetype6-dev \ @@ -22,8 +22,8 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ - #libmagickwand-dev \ - #libmemcached-dev \ + libmagickwand-dev \ + libmemcached-dev \ libpng-dev \ libpq-dev \ libssl-dev \ @@ -41,17 +41,17 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ xfonts-75dpi \ xfonts-base \ zlib1g-dev \ - #&& pecl install apcu \ - #&& pecl install imagick \ - #&& pecl install memcached \ - #&& pecl install oauth-2.0.4 \ + && pecl install apcu \ + && pecl install imagick \ + && pecl install memcached \ + && pecl install oauth \ && pecl install redis-5.3.4 \ && pecl install xdebug \ && 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 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 \ diff --git a/plugins/lando-services/services/php/8.1-fpm/Dockerfile b/plugins/lando-services/services/php/8.1-fpm/Dockerfile index 78d8759ab..a3ef8f67c 100644 --- a/plugins/lando-services/services/php/8.1-fpm/Dockerfile +++ b/plugins/lando-services/services/php/8.1-fpm/Dockerfile @@ -14,7 +14,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ default-mysql-client \ exiftool \ git-core \ - #imagemagick \ + imagemagick \ libbz2-dev \ libc-client-dev \ libfreetype6-dev \ @@ -22,8 +22,8 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ - #libmagickwand-dev \ - #libmemcached-dev \ + libmagickwand-dev \ + libmemcached-dev \ libpng-dev \ libpq-dev \ libssl-dev \ @@ -41,17 +41,17 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ xfonts-75dpi \ xfonts-base \ zlib1g-dev \ - #&& pecl install apcu \ - #&& pecl install imagick \ - #&& pecl install memcached \ - #&& pecl install oauth-2.0.4 \ + && pecl install apcu \ + && pecl install imagick \ + && pecl install memcached \ + && pecl install oauth-2.0.4 \ && pecl install redis-5.3.4 \ && pecl install xdebug \ && 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 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 \