diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e8159de..9c8a6d31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ #### Fixed - [#153](https://github.com/devilbox/docker-php-fpm/pull/153) Use numeric order for startup files - Fix build of PHP-FPM 7.4 snmp module +- Fix build of PHP-FPM 8.0 uploadprogress module ## Release 0.105 diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 36516a9e..ff590c89 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -455,7 +455,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension # Default: Pecl command && pecl install uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 8bae2ce7..32214ac8 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -555,7 +555,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension # Default: Pecl command && pecl install uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 2013abc4..27d93b21 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -574,7 +574,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension # Default: Pecl command && pecl install uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index ee484b5e..6cec40c8 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -562,7 +562,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension # Default: Pecl command && pecl install uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 9122fb5a..98a4154e 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -592,7 +592,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension # Default: Pecl command && pecl install uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 871f6cf7..c8938926 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -633,7 +633,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: GIT extension && git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 34fff300..68b3a741 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -642,7 +642,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: GIT extension && git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 708e0391..3891092e 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -646,7 +646,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: GIT extension && git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 748a0e77..bcb405ba 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -646,7 +646,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: GIT extension && git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 007f7061..c75a0274 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -595,7 +595,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: GIT extension && git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index 643e803a..b004f59d 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -453,22 +453,15 @@ RUN set -eux \ # -------------------- Installing PHP Extension: uploadprogress -------------------- RUN set -eux \ - # Installation: Version specific + # Installation: Generic # Type: GIT extension && git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \ && cd /tmp/uploadprogress \ - # Custom: Install command - && true \ -# FIXME: This is a work-around to mitigate compile error with PHP 8.0 -&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \ -&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \ -&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \ -&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \ -&& phpize \ -&& ./configure --enable-uploadprogress \ -&& make \ -&& make install \ - \ + # Default: Install command + && phpize \ + && ./configure --enable-uploadprogress \ + && make -j$(getconf _NPROCESSORS_ONLN) \ + && make install \ # Enabling && docker-php-ext-enable uploadprogress \ && true diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index dace7934..42d54eec 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -977,42 +977,20 @@ extensions_available: tokenizer: already_avail: "{{ php_all_versions }}" uploadprogress: - 7.0: - type: git - git_url: https://github.com/php/pecl-php-uploadprogress - configure: --enable-uploadprogress - 7.1: - type: git - git_url: https://github.com/php/pecl-php-uploadprogress - configure: --enable-uploadprogress - 7.2: - type: git - git_url: https://github.com/php/pecl-php-uploadprogress - configure: --enable-uploadprogress - 7.3: - type: git - git_url: https://github.com/php/pecl-php-uploadprogress - configure: --enable-uploadprogress - 7.4: + 5.2: + type: pecl + 5.3: + type: pecl + 5.4: + type: pecl + 5.5: + type: pecl + 5.6: + type: pecl + all: type: git git_url: https://github.com/php/pecl-php-uploadprogress configure: --enable-uploadprogress - 8.0: - type: git - git_url: https://github.com/php/pecl-php-uploadprogress - command: | - true \ - # FIXME: This is a work-around to mitigate compile error with PHP 8.0 - && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \ - && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \ - && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \ - && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \ - && phpize \ - && ./configure --enable-uploadprogress \ - && make \ - && make install \ - all: - type: pecl wddx: # https://wiki.php.net/rfc/deprecate-and-remove-ext-wddx disabled: [7.4, 8.0]