diff --git a/CHANGELOG.md b/CHANGELOG.md index fecf28c..2163b7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ ## Release 0.122 #### Added -- Added `apcu`, `igbinary`, `mcrypt`, `memcache`, `msgpack`, `oauth`, `psr`, `solr`, `xlswriter`, `yaml` to PHP 8.0 +- Added `apcu`, `blackfire`, `igbinary`, `imap`, `mcrypt`, `memcache`, `msgpack`, `oauth`, `psr`, `solr`, `xlswriter`, `yaml` to PHP 8.0 +- Added `apcu`, `igbinary`, `imap`, `mcrypt`, `memcache`, `msgpack`, `oauth`, `psr`, `solr`, `xlswriter`, `yaml` to PHP 8.1 ## Release 0.121 diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 3cefd3c..ebbd5ba 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -555,8 +555,6 @@ phpize \ && ./configure --enable-redis ${REDIS_ARGS} \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ -&& rm -rf /usr/local/include/php/ext/igbinary \ -&& rm -rf /usr/local/include/php/ext/msgpack \ \ # Enabling && docker-php-ext-enable redis \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index a9af24a..812130c 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -555,8 +555,6 @@ phpize \ && ./configure --enable-redis ${REDIS_ARGS} \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ -&& rm -rf /usr/local/include/php/ext/igbinary \ -&& rm -rf /usr/local/include/php/ext/msgpack \ \ # Enabling && docker-php-ext-enable redis \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 0bc9894..25b7a1e 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -558,8 +558,6 @@ phpize \ && ./configure --enable-redis ${REDIS_ARGS} \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ -&& rm -rf /usr/local/include/php/ext/igbinary \ -&& rm -rf /usr/local/include/php/ext/msgpack \ \ # Enabling && docker-php-ext-enable redis \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 3005ba7..3e60bc1 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -558,8 +558,6 @@ phpize \ && ./configure --enable-redis ${REDIS_ARGS} \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ -&& rm -rf /usr/local/include/php/ext/igbinary \ -&& rm -rf /usr/local/include/php/ext/msgpack \ \ # Enabling && docker-php-ext-enable redis \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index dcdd821..1852362 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -552,8 +552,6 @@ phpize \ && ./configure --enable-redis ${REDIS_ARGS} \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ -&& rm -rf /usr/local/include/php/ext/igbinary \ -&& rm -rf /usr/local/include/php/ext/msgpack \ \ # Enabling && docker-php-ext-enable redis \ diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index 13bce6e..944d683 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -14,6 +14,7 @@ RUN set -eux \ freetds-dev \ libaio-dev \ libbz2-dev \ + libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ libevent-dev \ @@ -23,6 +24,7 @@ RUN set -eux \ libib-util \ libicu-dev \ libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ libmcrypt-dev \ libmemcached-dev \ @@ -81,6 +83,20 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: blackfire -------------------- +RUN set -eux \ + # Installation: Generic + # Type: Custom extension + && version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ +&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \ +&& mkdir -p /tmp/blackfire \ +&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \ +&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \ +&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \ + \ + && true + + # -------------------- Installing PHP Extension: bz2 -------------------- RUN set -eux \ # Installation: Generic @@ -163,6 +179,18 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: imap -------------------- +RUN set -eux \ + # Generic pre-command + && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ + # Installation: Generic + # Type: Built-in extension + # Custom: configure command + && docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + && true + + # -------------------- Installing PHP Extension: intl -------------------- RUN set -eux \ # Installation: Generic @@ -629,6 +657,7 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ libaio1 \ libaspell15 \ + libc-client2007e \ libenchant1c2a \ libfbclient2 \ libffi6 \ @@ -726,6 +755,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^iconv$' \ && php -m | grep -oiE '^igbinary$' \ && php-fpm -m | grep -oiE '^igbinary$' \ + && php -m | grep -oiE '^imap$' \ + && php-fpm -m | grep -oiE '^imap$' \ && php -m | grep -oiE '^intl$' \ && php-fpm -m | grep -oiE '^intl$' \ && php -m | grep -oiE '^json$' \ diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 80283b0..24b4790 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -14,6 +14,8 @@ RUN set -eux \ freetds-dev \ libaio-dev \ libbz2-dev \ + libc-client-dev \ + libcurl4-openssl-dev \ libenchant-dev \ libevent-dev \ libfbclient2 \ @@ -22,8 +24,11 @@ RUN set -eux \ libib-util \ libicu-dev \ libjpeg-dev \ + libkrb5-dev \ libldap2-dev \ + libmcrypt-dev \ libmemcached-dev \ + libpcre3-dev \ libpng-dev \ libpq-dev \ libpspell-dev \ @@ -37,6 +42,7 @@ RUN set -eux \ libxml2-dev \ libxpm-dev \ libxslt-dev \ + libyaml-dev \ libzip-dev \ snmp \ zlib1g-dev \ @@ -58,6 +64,17 @@ RUN set -eux \ echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \ fi +# -------------------- Installing PHP Extension: apcu -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install apcu \ + # Enabling + && docker-php-ext-enable apcu \ + && true + + # -------------------- Installing PHP Extension: bcmath -------------------- RUN set -eux \ # Installation: Generic @@ -137,6 +154,29 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: igbinary -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install igbinary \ + # Enabling + && docker-php-ext-enable igbinary \ + && true + + +# -------------------- Installing PHP Extension: imap -------------------- +RUN set -eux \ + # Generic pre-command + && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ + # Installation: Generic + # Type: Built-in extension + # Custom: configure command + && docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ + && true + + # -------------------- Installing PHP Extension: intl -------------------- RUN set -eux \ # Installation: Generic @@ -157,6 +197,39 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: mcrypt -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install mcrypt \ + # Enabling + && docker-php-ext-enable mcrypt \ + && true + + +# -------------------- Installing PHP Extension: msgpack -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install msgpack \ + # Enabling + && docker-php-ext-enable msgpack \ + && true + + +# -------------------- Installing PHP Extension: memcache -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install memcache \ + # Enabling + && docker-php-ext-enable memcache \ + && true + + # -------------------- Installing PHP Extension: memcached -------------------- RUN set -eux \ # Installation: Version specific @@ -181,17 +254,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mongodb -------------------- RUN set -eux \ - # Installation: Version specific - # Type: GIT extension - && git clone https://github.com/mongodb/mongo-php-driver /tmp/mongodb \ - && cd /tmp/mongodb \ - # Custom: Install command - && git submodule update --init \ -&& phpize \ -&& ./configure --enable-mongodb \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ - \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install mongodb \ # Enabling && docker-php-ext-enable mongodb \ && true @@ -205,6 +271,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: oauth -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install oauth \ + # Enabling + && docker-php-ext-enable oauth \ + && true + + # -------------------- Installing PHP Extension: oci8 -------------------- RUN set -eux \ # Generic pre-command @@ -323,6 +400,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: psr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install psr \ + # Enabling + && docker-php-ext-enable psr \ + && true + + # -------------------- Installing PHP Extension: pspell -------------------- RUN set -eux \ # Installation: Generic @@ -351,8 +439,6 @@ phpize \ && ./configure --enable-redis ${REDIS_ARGS} \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ -&& rm -rf /usr/local/include/php/ext/igbinary \ -&& rm -rf /usr/local/include/php/ext/msgpack \ \ # Enabling && docker-php-ext-enable redis \ @@ -403,6 +489,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: solr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install solr \ + # Enabling + && docker-php-ext-enable solr \ + && true + + # -------------------- Installing PHP Extension: sysvmsg -------------------- RUN set -eux \ # Installation: Generic @@ -461,6 +558,28 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: xlswriter -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install xlswriter \ + # Enabling + && docker-php-ext-enable xlswriter \ + && true + + +# -------------------- Installing PHP Extension: yaml -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install yaml \ + # Enabling + && docker-php-ext-enable yaml \ + && true + + # -------------------- Installing PHP Extension: zip -------------------- RUN set -eux \ # Installation: Generic @@ -531,12 +650,14 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ libaio1 \ libaspell15 \ + libc-client2007e \ libenchant1c2a \ libfbclient2 \ libffi6 \ libfreetype6 \ libicu63 \ libjpeg62-turbo \ + libmcrypt4 \ libmemcachedutil2 \ libpng16-16 \ libpq5 \ @@ -546,6 +667,7 @@ RUN set -eux \ libwebp6 \ libxpm4 \ libxslt1.1 \ + libyaml-0-2 \ libzip4 \ snmp \ ca-certificates \ @@ -586,6 +708,8 @@ RUN set -eux \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini \ \ + && php -m | grep -oiE '^apcu$' \ + && php-fpm -m | grep -oiE '^apcu$' \ && php -m | grep -oiE '^bcmath$' \ && php-fpm -m | grep -oiE '^bcmath$' \ && php -m | grep -oiE '^bz2$' \ @@ -622,6 +746,10 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^hash$' \ && php -m | grep -oiE '^iconv$' \ && php-fpm -m | grep -oiE '^iconv$' \ + && php -m | grep -oiE '^igbinary$' \ + && php-fpm -m | grep -oiE '^igbinary$' \ + && php -m | grep -oiE '^imap$' \ + && php-fpm -m | grep -oiE '^imap$' \ && php -m | grep -oiE '^intl$' \ && php-fpm -m | grep -oiE '^intl$' \ && php -m | grep -oiE '^json$' \ @@ -632,6 +760,12 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^libxml$' \ && php -m | grep -oiE '^mbstring$' \ && php-fpm -m | grep -oiE '^mbstring$' \ + && php -m | grep -oiE '^mcrypt$' \ + && php-fpm -m | grep -oiE '^mcrypt$' \ + && php -m | grep -oiE '^msgpack$' \ + && php-fpm -m | grep -oiE '^msgpack$' \ + && php -m | grep -oiE '^memcache$' \ + && php-fpm -m | grep -oiE '^memcache$' \ && php -m | grep -oiE '^memcached$' \ && php-fpm -m | grep -oiE '^memcached$' \ && php -m | grep -oiE '^mongodb$' \ @@ -640,6 +774,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^mysqli$' \ && php -m | grep -oiE '^mysqlnd$' \ && php-fpm -m | grep -oiE '^mysqlnd$' \ + && php -m | grep -oiE '^oauth$' \ + && php-fpm -m | grep -oiE '^oauth$' \ && php -m | grep -oiE '^oci8$' \ && php-fpm -m | grep -oiE '^oci8$' \ && php -m | grep -oiE '^Zend Opcache$' \ @@ -666,6 +802,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^pdo_sqlite$' \ && php -m | grep -oiE '^pgsql$' \ && php-fpm -m | grep -oiE '^pgsql$' \ + && php -m | grep -oiE '^psr$' \ + && php-fpm -m | grep -oiE '^psr$' \ && php -m | grep -oiE '^phar$' \ && php-fpm -m | grep -oiE '^phar$' \ && php -m | grep -oiE '^posix$' \ @@ -691,6 +829,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sockets$' \ && php -m | grep -oiE '^sodium$' \ && php-fpm -m | grep -oiE '^sodium$' \ + && php -m | grep -oiE '^solr$' \ + && php-fpm -m | grep -oiE '^solr$' \ && php -m | grep -oiE '^spl$' \ && php-fpm -m | grep -oiE '^spl$' \ && php -m | grep -oiE '^sysvmsg$' \ @@ -713,6 +853,10 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^xmlwriter$' \ && php -m | grep -oiE '^xsl$' \ && php-fpm -m | grep -oiE '^xsl$' \ + && php -m | grep -oiE '^xlswriter$' \ + && php-fpm -m | grep -oiE '^xlswriter$' \ + && php -m | grep -oiE '^yaml$' \ + && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ && true diff --git a/README.md b/README.md index 54ed4ce..83a115e 100644 --- a/README.md +++ b/README.md @@ -681,12 +681,12 @@ Check out this table to see which Docker image provides what PHP modules. 8.0 Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 8.1 Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xml, xmlreader, xmlwriter, xsl, Zend OPcache, zip, zlib + apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 2e884c9..da8c2c7 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -168,7 +168,7 @@ extensions_available: build_dep: [librabbitmq-dev] run_dep: [librabbitmq4] apcu: - disabled: [5.2, 8.1] + disabled: [5.2] 5.3: type: pecl version: 4.0.11 @@ -187,7 +187,7 @@ extensions_available: all: type: builtin blackfire: - disabled: [5.2, 5.3, 5.4, 5.5, 8.0, 8.1] + disabled: [5.2, 5.3, 5.4, 5.5, 8.1] all: type: custom command: | @@ -329,7 +329,7 @@ extensions_available: iconv: already_avail: "{{ php_all_versions }}" igbinary: - disabled: [8.1] + disabled: [] 5.2: type: pecl version: 2.0.7 @@ -376,7 +376,7 @@ extensions_available: && sed -i'' 's|.*= 7.2 by phalcon >=4.0 module + disabled: [5.2, 5.3] # IMPORTANT: Required by PHP >= 7.2 by phalcon >=4.0 module 5.4: type: pecl version: 0.5.1 @@ -933,7 +924,7 @@ extensions_available: type: builtin build_dep: [libsodium-dev] solr: - disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 8.1] + disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] all: type: pecl build_dep: [libxml2-dev, libcurl4-openssl-dev] @@ -1166,7 +1157,7 @@ extensions_available: all: type: pecl xlswriter: - disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.1] + disabled: [5.2, 5.3, 5.4, 5.5, 5.6] all: type: pecl build_dep: [zlib1g-dev] @@ -1192,7 +1183,7 @@ extensions_available: build_dep: [libxslt-dev] run_dep: [libxslt1.1] yaml: - disabled: [5.2, 8.1] + disabled: [5.2] 5.3: type: pecl version: 1.3.2