diff --git a/8/Dockerfile b/8/Dockerfile index fcc2a3c..05cae52 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -184,6 +184,15 @@ RUN set -xe; \ xsl \ zip; \ \ + if [[ "${PHP_VERSION:0:3}" == "8.3" ]]; then \ + cd /usr/src/php/ext/; \ + git clone https://github.com/Imagick/imagick; \ + cd imagick; \ + git reset --hard 28f27044e435a2b203e32675e942eb8de620ee58; \ + docker-php-ext-configure imagick; \ + docker-php-ext-install "-j${NPROC}" imagick; \ + fi; \ + \ # GD docker-php-ext-configure gd \ --with-webp \ @@ -356,24 +365,25 @@ RUN set -xe; \ chown root:www-data /etc/crontabs/www-data; \ chmod 660 /etc/crontabs/www-data; \ \ + if [[ -z "${PHP_DEV}" ]]; then \ + strip --strip-debug /usr/local/lib/php/extensions/no-debug-non-zts-*/*.so; \ + docker-php-source delete; \ + rm -rf /usr/src/php.tar.xz; \ + fi; \ + \ su-exec wodby composer clear-cache; \ apk del --purge .wodby-php-build-deps; \ pecl clear-cache; \ \ rm -rf \ - /usr/src/php/ext/ast \ - /usr/src/php/ext/uploadprogress \ + /usr/src/php/ext/brotli \ + /usr/src/php/ext/imagick \ /usr/include/php \ /usr/lib/php/build \ /tmp/* \ /root/.composer \ - /var/cache/apk/*; \ - \ - if [[ -z "${PHP_DEV}" ]]; then \ - strip --strip-debug /usr/local/lib/php/extensions/no-debug-non-zts-*/*.so; \ - docker-php-source delete; \ - rm -rf /usr/src/php.tar.xz; \ - fi + /var/cache/apk/* + USER wodby diff --git a/8/tests/php_modules/8.3 b/8/tests/php_modules/8.3 index 68494b8..f3dfe44 100644 --- a/8/tests/php_modules/8.3 +++ b/8/tests/php_modules/8.3 @@ -23,6 +23,7 @@ grpc hash iconv igbinary +imagick imap intl json diff --git a/README.md b/README.md index c0019ea..c4f52b3 100644 --- a/README.md +++ b/README.md @@ -201,85 +201,85 @@ user/group ids the latter will be deleted. You can disable extension by listing them in `$PHP_EXTENSIONS_DISABLE` separated by `,`, e.g. `$PHP_EXTENSIONS_DISABLE=event,ds` -| Extension | 8.3 | 8.2 | 8.1 | -|------------------|--------|--------|--------| -| [amqp] | 2.1.1 | 2.1.1 | 2.1.1 | -| [apcu] | 5.1.23 | 5.1.23 | 5.1.23 | -| [ast] | 1.1.1 | 1.1.1 | 1.1.1 | -| bcmath | | | | -| brotli | 0.14.2 | 0.14.2 | 0.14.2 | -| bz2 | | | | -| calendar | | | | -| Core | | | | -| ctype | | | | -| curl | | | | -| date | | | | -| dom | | | | -| [ds] | 1.5.0 | 1.5.0 | 1.5.0 | -| exif | | | | -| [event] | 3.0.8 | 3.0.8 | 3.0.8 | -| fileinfo | | | | -| filter | | | | -| ftp | | | | -| gd | | | | -| [grpc] | 1.60.0 | 1.60.0 | 1.60.0 | -| hash | | | | -| iconv | | | | -| [igbinary] | 3.2.15 | 3.2.15 | 3.2.15 | -| [imagick] | - | 3.7.0 | 3.7.0 | -| imap | | | | -| intl | | | | -| json | | | | -| ldap | | | | -| libxml | | | | -| mbstring | | | | -| [memcached] | 3.2.0 | 3.2.0 | 3.2.0 | -| [mongodb] | 1.17.1 | 1.17.1 | 1.17.1 | -| mysqli | | | | -| mysqlnd | | | | -| [newrelic] | latest | latest | latest | -| [OAuth] | 2.0.7 | 2.0.7 | 2.0.7 | -| openssl | | | | -| [opentelemetry] | 1.0.0 | 1.0.0 | 1.0.0 | -| [pcov] | latest | latest | latest | -| pcntl | | | | -| pcre | | | | -| PDO | | | | -| pdo_mysql | | | | -| pdo_pgsql | | | | -| pdo_sqlite | | | | -| [pdo_sqlsrv]* | 5.11.1 | 5.11.1 | 5.11.1 | -| pgsql | | | | -| Phar | | | | -| posix | | | | -| [rdkafka] | 6.0.3 | 6.0.3 | 6.0.3 | -| readline | | | | -| [redis] | 5.3.7 | 5.3.7 | 5.3.7 | -| Reflection | | | | -| session | | | | -| SimpleXML | | | | -| [smbclient] | 1.1.1 | 1.1.1 | 1.1.1 | -| soap | | | | -| sockets | | | | -| sodium | | | | -| SPL | | | | -| sqlite3 | | | | -| [sqlsrv]* | 5.11.1 | 5.11.1 | 5.11.1 | -| standard | | | | -| tidy | | | | -| tokenizer | | | | -| [uploadprogress] | 2.0.2 | 2.0.2 | 2.0.2 | -| [uuid] | 1.2.0 | 1.2.0 | 1.2.0 | -| [xdebug] | 3.3.1 | 3.3.1 | 3.3.1 | -| [xhprof] | 2.3.9 | 2.3.9 | 2.3.9 | -| xml | | | | -| xmlreader | | | | -| xmlwriter | | | | -| xsl | | | | -| [yaml] | 2.2.3 | 2.2.3 | 2.2.3 | -| Zend OPcache | | | | -| zip | | | | -| zlib | | | | +| Extension | 8.3 | 8.2 | 8.1 | +|------------------|----------|--------|--------| +| [amqp] | 2.1.1 | 2.1.1 | 2.1.1 | +| [apcu] | 5.1.23 | 5.1.23 | 5.1.23 | +| [ast] | 1.1.1 | 1.1.1 | 1.1.1 | +| bcmath | | | | +| brotli | 0.14.2 | 0.14.2 | 0.14.2 | +| bz2 | | | | +| calendar | | | | +| Core | | | | +| ctype | | | | +| curl | | | | +| date | | | | +| dom | | | | +| [ds] | 1.5.0 | 1.5.0 | 1.5.0 | +| exif | | | | +| [event] | 3.0.8 | 3.0.8 | 3.0.8 | +| fileinfo | | | | +| filter | | | | +| ftp | | | | +| gd | | | | +| [grpc] | 1.60.0 | 1.60.0 | 1.60.0 | +| hash | | | | +| iconv | | | | +| [igbinary] | 3.2.15 | 3.2.15 | 3.2.15 | +| [imagick] | `master` | 3.7.0 | 3.7.0 | +| imap | | | | +| intl | | | | +| json | | | | +| ldap | | | | +| libxml | | | | +| mbstring | | | | +| [memcached] | 3.2.0 | 3.2.0 | 3.2.0 | +| [mongodb] | 1.17.1 | 1.17.1 | 1.17.1 | +| mysqli | | | | +| mysqlnd | | | | +| [newrelic] | latest | latest | latest | +| [OAuth] | 2.0.7 | 2.0.7 | 2.0.7 | +| openssl | | | | +| [opentelemetry] | 1.0.0 | 1.0.0 | 1.0.0 | +| [pcov] | latest | latest | latest | +| pcntl | | | | +| pcre | | | | +| PDO | | | | +| pdo_mysql | | | | +| pdo_pgsql | | | | +| pdo_sqlite | | | | +| [pdo_sqlsrv]* | 5.11.1 | 5.11.1 | 5.11.1 | +| pgsql | | | | +| Phar | | | | +| posix | | | | +| [rdkafka] | 6.0.3 | 6.0.3 | 6.0.3 | +| readline | | | | +| [redis] | 5.3.7 | 5.3.7 | 5.3.7 | +| Reflection | | | | +| session | | | | +| SimpleXML | | | | +| [smbclient] | 1.1.1 | 1.1.1 | 1.1.1 | +| soap | | | | +| sockets | | | | +| sodium | | | | +| SPL | | | | +| sqlite3 | | | | +| [sqlsrv]* | 5.11.1 | 5.11.1 | 5.11.1 | +| standard | | | | +| tidy | | | | +| tokenizer | | | | +| [uploadprogress] | 2.0.2 | 2.0.2 | 2.0.2 | +| [uuid] | 1.2.0 | 1.2.0 | 1.2.0 | +| [xdebug] | 3.3.1 | 3.3.1 | 3.3.1 | +| [xhprof] | 2.3.9 | 2.3.9 | 2.3.9 | +| xml | | | | +| xmlreader | | | | +| xmlwriter | | | | +| xsl | | | | +| [yaml] | 2.2.3 | 2.2.3 | 2.2.3 | +| Zend OPcache | | | | +| zip | | | | +| zlib | | | | Legend: