From 07e5cfd02a3a377a570a0fa871213ada715cd212 Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Wed, 15 Jan 2025 14:54:41 +0100 Subject: [PATCH] Disable build of conflicting `swoole` extension --- 8.0.Dockerfile | 2 +- 8.1.Dockerfile | 2 +- 8.2.Dockerfile | 2 +- 8.3.Dockerfile | 2 +- 8.4.Dockerfile | 2 +- README.md | 1 - bin/generate-supported-extensions.php | 1 + 7 files changed, 6 insertions(+), 6 deletions(-) diff --git a/8.0.Dockerfile b/8.0.Dockerfile index 0600163..044fb8d 100644 --- a/8.0.Dockerfile +++ b/8.0.Dockerfile @@ -26,7 +26,7 @@ RUN additionalPackages=" \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install PHP extensions -RUN extensions="amqp apcu ast bcmath bitset blackfire brotli bz2 calendar csv dba decimal ds enchant ev event excimer exif ffi gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb mcrypt md4c memcache memcached memprof mongodb msgpack mysqli newrelic oauth odbc opcache openswoole opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql phalcon php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick seaslog shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr sourceguardian spx sqlsrv ssh2 swoole sync sysvmsg sysvsem sysvshm tensor tideways tidy timezonedb uopz uploadprogress uuid uv vips vld wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ +RUN extensions="amqp apcu ast bcmath bitset blackfire brotli bz2 calendar csv dba decimal ds enchant ev event excimer exif ffi gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb mcrypt md4c memcache memcached memprof mongodb msgpack mysqli newrelic oauth odbc opcache openswoole opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql phalcon php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick seaslog shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr sourceguardian spx sqlsrv ssh2 sync sysvmsg sysvsem sysvshm tensor tideways tidy timezonedb uopz uploadprogress uuid uv vips vld wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ && curl -sSLf -o /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \ && chmod +x /usr/local/bin/install-php-extensions \ && install-php-extensions $extensions \ diff --git a/8.1.Dockerfile b/8.1.Dockerfile index f8df731..7ef2739 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -26,7 +26,7 @@ RUN additionalPackages=" \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install PHP extensions -RUN extensions="amqp apcu ast bcmath bitset blackfire brotli bz2 calendar csv dba decimal ds enchant ev event excimer exif ffi gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb mcrypt md4c memcache memcached memprof mongodb msgpack mysqli newrelic oauth odbc opcache openswoole opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql phalcon php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick seaslog shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr sourceguardian spx sqlsrv ssh2 swoole sync sysvmsg sysvsem sysvshm tensor tideways tidy timezonedb uopz uploadprogress uuid uv vips vld wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ +RUN extensions="amqp apcu ast bcmath bitset blackfire brotli bz2 calendar csv dba decimal ds enchant ev event excimer exif ffi gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb mcrypt md4c memcache memcached memprof mongodb msgpack mysqli newrelic oauth odbc opcache openswoole opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql phalcon php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick seaslog shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr sourceguardian spx sqlsrv ssh2 sync sysvmsg sysvsem sysvshm tensor tideways tidy timezonedb uopz uploadprogress uuid uv vips vld wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ && curl -sSLf -o /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \ && chmod +x /usr/local/bin/install-php-extensions \ && install-php-extensions $extensions \ diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 01dfec6..20f1aae 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -26,7 +26,7 @@ RUN additionalPackages=" \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install PHP extensions -RUN extensions="amqp apcu ast bcmath bitset blackfire brotli bz2 calendar csv dba decimal ds ecma_intl enchant ev event excimer exif ffi ftp gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb mcrypt md4c memcache memcached memprof mongodb msgpack mysqli newrelic oauth odbc opcache openswoole opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql phalcon php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick seaslog shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr sourceguardian spx sqlsrv ssh2 stomp swoole sync sysvmsg sysvsem sysvshm tensor tideways tidy timezonedb uopz uploadprogress uuid uv vips vld wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ +RUN extensions="amqp apcu ast bcmath bitset blackfire brotli bz2 calendar csv dba decimal ds ecma_intl enchant ev event excimer exif ffi ftp gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb mcrypt md4c memcache memcached memprof mongodb msgpack mysqli newrelic oauth odbc opcache openswoole opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql phalcon php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick seaslog shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr sourceguardian spx sqlsrv ssh2 stomp sync sysvmsg sysvsem sysvshm tensor tideways tidy timezonedb uopz uploadprogress uuid uv vips vld wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ && curl -sSLf -o /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \ && chmod +x /usr/local/bin/install-php-extensions \ && install-php-extensions $extensions \ diff --git a/8.3.Dockerfile b/8.3.Dockerfile index de7aaf2..d41cb7a 100644 --- a/8.3.Dockerfile +++ b/8.3.Dockerfile @@ -26,7 +26,7 @@ RUN additionalPackages=" \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install PHP extensions -RUN extensions="amqp apcu ast bcmath bitset blackfire brotli bz2 calendar csv dba decimal ds ecma_intl enchant ev event excimer exif ffi ftp gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb mcrypt md4c memcache memcached memprof mongodb msgpack mysqli newrelic oauth odbc opcache openswoole opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql phalcon php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick seaslog shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr sourceguardian spx sqlsrv ssh2 stomp swoole sync sysvmsg sysvsem sysvshm tideways tidy timezonedb uopz uploadprogress uuid uv vips vld wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ +RUN extensions="amqp apcu ast bcmath bitset blackfire brotli bz2 calendar csv dba decimal ds ecma_intl enchant ev event excimer exif ffi ftp gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb mcrypt md4c memcache memcached memprof mongodb msgpack mysqli newrelic oauth odbc opcache openswoole opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql phalcon php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick seaslog shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr sourceguardian spx sqlsrv ssh2 stomp sync sysvmsg sysvsem sysvshm tideways tidy timezonedb uopz uploadprogress uuid uv vips vld wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ && curl -sSLf -o /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \ && chmod +x /usr/local/bin/install-php-extensions \ && install-php-extensions $extensions \ diff --git a/8.4.Dockerfile b/8.4.Dockerfile index e6304bb..a6557b9 100644 --- a/8.4.Dockerfile +++ b/8.4.Dockerfile @@ -26,7 +26,7 @@ RUN additionalPackages=" \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install PHP extensions -RUN extensions="amqp apcu ast bcmath bitset brotli bz2 calendar csv dba decimal ds enchant ev event excimer exif ffi ftp gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb md4c memcache memcached memprof mongodb msgpack mysqli oauth odbc opcache opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr spx sqlsrv ssh2 stomp swoole sync sysvmsg sysvsem sysvshm tideways tidy timezonedb uploadprogress uuid uv vips wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ +RUN extensions="amqp apcu ast bcmath bitset brotli bz2 calendar csv dba decimal ds enchant ev event excimer exif ffi ftp gd gearman geos geospatial gettext gmp gnupg grpc http igbinary imagick imap inotify intl json_post jsonpath ldap luasandbox lz4 lzf mailparse maxminddb md4c memcache memcached memprof mongodb msgpack mysqli oauth odbc opcache opentelemetry parle pcntl pcov pdo_dblib pdo_firebird pdo_mysql pdo_odbc pdo_pgsql pdo_sqlsrv pgsql php_trie phpy pkcs11 pq protobuf pspell psr raphf rdkafka redis saxon seasclick shmop simdjson smbclient snappy snmp snuffleupagus soap sockets solr spx sqlsrv ssh2 stomp sync sysvmsg sysvsem sysvshm tideways tidy timezonedb uploadprogress uuid uv vips wikidiff2 xdebug xhprof xlswriter xmldiff xmlrpc xpass xsl yac yaml yar zephir_parser zip zmq zookeeper zstd" \ && curl -sSLf -o /usr/local/bin/install-php-extensions https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions \ && chmod +x /usr/local/bin/install-php-extensions \ && install-php-extensions $extensions \ diff --git a/README.md b/README.md index 31a88f1..6ae9501 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,6 @@ before_script: - sqlsrv - ssh2 - stomp -- swoole - sync - sysvmsg - sysvsem diff --git a/bin/generate-supported-extensions.php b/bin/generate-supported-extensions.php index 849568c..d470d28 100644 --- a/bin/generate-supported-extensions.php +++ b/bin/generate-supported-extensions.php @@ -17,6 +17,7 @@ 'parallel', // Requires ZTS build 'pdo_oci', // This one seems to cause build issues 'relay', // This one seems to cause build issues + 'swoole', // Conflicts with openswoole which is preferred 'xdiff', // This one seems to cause build issues ];