diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile index 712c1f95..accec3da 100644 --- a/images/php/7.2-cli/Dockerfile +++ b/images/php/7.2-cli/Dockerfile @@ -29,7 +29,7 @@ ENV MAGENTO_RUN_MODE production ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Configure Node.js version RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash diff --git a/images/php/7.2-fpm/Dockerfile b/images/php/7.2-fpm/Dockerfile index e0ee3cbd..51086033 100644 --- a/images/php/7.2-fpm/Dockerfile +++ b/images/php/7.2-fpm/Dockerfile @@ -22,7 +22,7 @@ ENV UPLOAD_MAX_FILESIZE 64M ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Install dependencies RUN apt-get update \ diff --git a/images/php/7.3-cli/Dockerfile b/images/php/7.3-cli/Dockerfile index 0cc15df7..fcec0aa6 100644 --- a/images/php/7.3-cli/Dockerfile +++ b/images/php/7.3-cli/Dockerfile @@ -29,7 +29,7 @@ ENV MAGENTO_RUN_MODE production ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Configure Node.js version RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash diff --git a/images/php/7.3-fpm/Dockerfile b/images/php/7.3-fpm/Dockerfile index 39e6c977..001ddfe7 100644 --- a/images/php/7.3-fpm/Dockerfile +++ b/images/php/7.3-fpm/Dockerfile @@ -22,7 +22,7 @@ ENV UPLOAD_MAX_FILESIZE 64M ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Install dependencies RUN apt-get update \ diff --git a/images/php/7.4-cli/Dockerfile b/images/php/7.4-cli/Dockerfile index 949519b7..9991f25e 100644 --- a/images/php/7.4-cli/Dockerfile +++ b/images/php/7.4-cli/Dockerfile @@ -29,7 +29,7 @@ ENV MAGENTO_RUN_MODE production ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Configure Node.js version RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash @@ -61,6 +61,7 @@ RUN apt-get update \ libjpeg62-turbo-dev \ libpng-dev \ libfreetype6-dev \ + libwebp-dev \ libgeoip-dev \ wget \ libgmp-dev \ @@ -89,7 +90,7 @@ RUN sudo chmod +x /usr/local/bin/mhsendmail # Configure the gd library RUN docker-php-ext-configure \ - gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ + gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include/ RUN docker-php-ext-configure \ opcache --enable-opcache diff --git a/images/php/7.4-fpm/Dockerfile b/images/php/7.4-fpm/Dockerfile index 2c085a62..df7d14b4 100644 --- a/images/php/7.4-fpm/Dockerfile +++ b/images/php/7.4-fpm/Dockerfile @@ -22,7 +22,7 @@ ENV UPLOAD_MAX_FILESIZE 64M ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Install dependencies RUN apt-get update \ @@ -42,6 +42,7 @@ RUN apt-get update \ libjpeg62-turbo-dev \ libpng-dev \ libfreetype6-dev \ + libwebp-dev \ libgeoip-dev \ wget \ libgmp-dev \ @@ -64,7 +65,7 @@ RUN sudo chmod +x /usr/local/bin/mhsendmail # Configure the gd library RUN docker-php-ext-configure \ - gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ + gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include/ RUN docker-php-ext-configure \ opcache --enable-opcache diff --git a/images/php/8.0-cli/Dockerfile b/images/php/8.0-cli/Dockerfile index 45dd71d1..47310652 100644 --- a/images/php/8.0-cli/Dockerfile +++ b/images/php/8.0-cli/Dockerfile @@ -29,7 +29,7 @@ ENV MAGENTO_RUN_MODE production ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Configure Node.js version RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash @@ -61,8 +61,11 @@ RUN apt-get update \ libjpeg62-turbo-dev \ libpng-dev \ libfreetype6-dev \ + libwebp-dev \ libgmp-dev \ libgpgme11-dev \ + libmagickwand-dev \ + libmagickcore-dev \ libicu-dev \ libldap2-dev \ libpcre3-dev \ @@ -86,7 +89,7 @@ RUN sudo chmod +x /usr/local/bin/mhsendmail # Configure the gd library RUN docker-php-ext-configure \ - gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ + gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include/ RUN docker-php-ext-configure \ opcache --enable-opcache @@ -117,6 +120,7 @@ RUN docker-php-ext-install -j$(nproc) \ RUN pecl install -o -f \ gnupg \ + imagick \ mailparse \ msgpack \ oauth \ diff --git a/images/php/8.0-fpm/Dockerfile b/images/php/8.0-fpm/Dockerfile index c97994d6..fb2f5a75 100644 --- a/images/php/8.0-fpm/Dockerfile +++ b/images/php/8.0-fpm/Dockerfile @@ -22,7 +22,7 @@ ENV UPLOAD_MAX_FILESIZE 64M ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Install dependencies RUN apt-get update \ @@ -42,8 +42,11 @@ RUN apt-get update \ libjpeg62-turbo-dev \ libpng-dev \ libfreetype6-dev \ + libwebp-dev \ libgmp-dev \ libgpgme11-dev \ + libmagickwand-dev \ + libmagickcore-dev \ libicu-dev \ libldap2-dev \ libpcre3-dev \ @@ -61,7 +64,7 @@ RUN sudo chmod +x /usr/local/bin/mhsendmail # Configure the gd library RUN docker-php-ext-configure \ - gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ + gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include/ RUN docker-php-ext-configure \ opcache --enable-opcache @@ -92,6 +95,7 @@ RUN docker-php-ext-install -j$(nproc) \ RUN pecl install -o -f \ gnupg \ + imagick \ mailparse \ msgpack \ oauth \ diff --git a/images/php/8.1-cli/Dockerfile b/images/php/8.1-cli/Dockerfile index 99010a5f..8655fa7a 100644 --- a/images/php/8.1-cli/Dockerfile +++ b/images/php/8.1-cli/Dockerfile @@ -29,7 +29,7 @@ ENV MAGENTO_RUN_MODE production ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Configure Node.js version RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash @@ -61,8 +61,11 @@ RUN apt-get update \ libjpeg62-turbo-dev \ libpng-dev \ libfreetype6-dev \ + libwebp-dev \ libgmp-dev \ libgpgme11-dev \ + libmagickwand-dev \ + libmagickcore-dev \ libicu-dev \ libldap2-dev \ libpcre3-dev \ @@ -86,7 +89,7 @@ RUN sudo chmod +x /usr/local/bin/mhsendmail # Configure the gd library RUN docker-php-ext-configure \ - gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ + gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include/ RUN docker-php-ext-configure \ opcache --enable-opcache @@ -117,6 +120,7 @@ RUN docker-php-ext-install -j$(nproc) \ RUN pecl install -o -f \ gnupg \ + imagick \ mailparse \ msgpack \ oauth \ diff --git a/images/php/8.1-fpm/Dockerfile b/images/php/8.1-fpm/Dockerfile index f9f544dd..0603a347 100644 --- a/images/php/8.1-fpm/Dockerfile +++ b/images/php/8.1-fpm/Dockerfile @@ -22,7 +22,7 @@ ENV UPLOAD_MAX_FILESIZE 64M ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Install dependencies RUN apt-get update \ @@ -42,8 +42,11 @@ RUN apt-get update \ libjpeg62-turbo-dev \ libpng-dev \ libfreetype6-dev \ + libwebp-dev \ libgmp-dev \ libgpgme11-dev \ + libmagickwand-dev \ + libmagickcore-dev \ libicu-dev \ libldap2-dev \ libpcre3-dev \ @@ -61,7 +64,7 @@ RUN sudo chmod +x /usr/local/bin/mhsendmail # Configure the gd library RUN docker-php-ext-configure \ - gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ + gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include/ RUN docker-php-ext-configure \ opcache --enable-opcache @@ -92,6 +95,7 @@ RUN docker-php-ext-install -j$(nproc) \ RUN pecl install -o -f \ gnupg \ + imagick \ mailparse \ msgpack \ oauth \ diff --git a/images/php/8.2-cli/Dockerfile b/images/php/8.2-cli/Dockerfile index dbafd471..fd2dd802 100644 --- a/images/php/8.2-cli/Dockerfile +++ b/images/php/8.2-cli/Dockerfile @@ -29,7 +29,7 @@ ENV MAGENTO_RUN_MODE production ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Configure Node.js version RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash @@ -61,8 +61,11 @@ RUN apt-get update \ libjpeg62-turbo-dev \ libpng-dev \ libfreetype6-dev \ + libwebp-dev \ libgmp-dev \ libgpgme11-dev \ + libmagickwand-dev \ + libmagickcore-dev \ libicu-dev \ libldap2-dev \ libpcre3-dev \ @@ -87,7 +90,7 @@ RUN sudo chmod +x /usr/local/bin/mhsendmail # Configure the gd library RUN docker-php-ext-configure \ - gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ + gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include/ RUN docker-php-ext-configure \ opcache --enable-opcache @@ -118,6 +121,7 @@ RUN docker-php-ext-install -j$(nproc) \ RUN pecl install -o -f \ gnupg \ + imagick \ mailparse \ msgpack \ oauth \ diff --git a/images/php/8.2-fpm/Dockerfile b/images/php/8.2-fpm/Dockerfile index de75c9a5..0a59c7f1 100644 --- a/images/php/8.2-fpm/Dockerfile +++ b/images/php/8.2-fpm/Dockerfile @@ -22,7 +22,7 @@ ENV UPLOAD_MAX_FILESIZE 64M ENV SENDMAIL_PATH /dev/null ENV PHPRC ${MAGENTO_ROOT}/php.ini -ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl +ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext imagick intl mysqli opcache pdo_mysql redis soap sockets sodium sysvmsg sysvsem sysvshm xsl zip pcntl # Install dependencies RUN apt-get update \ @@ -42,8 +42,11 @@ RUN apt-get update \ libjpeg62-turbo-dev \ libpng-dev \ libfreetype6-dev \ + libwebp-dev \ libgmp-dev \ libgpgme11-dev \ + libmagickwand-dev \ + libmagickcore-dev \ libicu-dev \ libldap2-dev \ libpcre3-dev \ @@ -62,7 +65,7 @@ RUN sudo chmod +x /usr/local/bin/mhsendmail # Configure the gd library RUN docker-php-ext-configure \ - gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ + gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include/ RUN docker-php-ext-configure \ opcache --enable-opcache @@ -93,6 +96,7 @@ RUN docker-php-ext-install -j$(nproc) \ RUN pecl install -o -f \ gnupg \ + imagick \ mailparse \ msgpack \ oauth \ diff --git a/src/Command/Image/GeneratePhp.php b/src/Command/Image/GeneratePhp.php index 044a5ba0..68de8c1f 100644 --- a/src/Command/Image/GeneratePhp.php +++ b/src/Command/Image/GeneratePhp.php @@ -76,6 +76,7 @@ class GeneratePhp extends Command 'exif', 'gd', 'gettext', + 'imagick', 'intl', 'mysqli', 'mcrypt', diff --git a/src/Compose/Php/ExtensionResolver.php b/src/Compose/Php/ExtensionResolver.php index 97db7a5b..b94c8654 100644 --- a/src/Compose/Php/ExtensionResolver.php +++ b/src/Compose/Php/ExtensionResolver.php @@ -210,10 +210,11 @@ public static function getConfig(): array ], '>=7.4' => [ self::EXTENSION_TYPE => self::EXTENSION_TYPE_CORE, - self::EXTENSION_OS_DEPENDENCIES => ['libjpeg62-turbo-dev', 'libpng-dev', 'libfreetype6-dev'], + self::EXTENSION_OS_DEPENDENCIES => ['libjpeg62-turbo-dev', 'libpng-dev', 'libfreetype6-dev', 'libwebp-dev'], self::EXTENSION_CONFIGURE_OPTIONS => [ '--with-freetype=/usr/include/', - '--with-jpeg=/usr/include/' + '--with-jpeg=/usr/include/', + '--with-webp=/usr/include/' ], ], ], @@ -243,7 +244,7 @@ public static function getConfig(): array '>=7.0 <8.0' => [self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL], ], 'imagick' => [ - '>=7.0 <8.0' => [ + '>=7.0' => [ self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL, self::EXTENSION_OS_DEPENDENCIES => ['libmagickwand-dev', 'libmagickcore-dev'], ],