Skip to content

Commit 44cc009

Browse files
committed
Use pecl to install uploadprogress
1 parent 881dd56 commit 44cc009

8 files changed

Lines changed: 24 additions & 49 deletions

File tree

Dockerfiles/mods/Dockerfile-7.0

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -676,15 +676,10 @@ RUN set -eux \
676676

677677
# -------------------- Installing PHP Extension: uploadprogress --------------------
678678
RUN set -eux \
679-
# Installation: Generic
680-
# Type: GIT extension
681-
&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
682-
&& cd /tmp/uploadprogress \
683-
# Default: Install command
684-
&& phpize \
685-
&& ./configure --enable-uploadprogress \
686-
&& make -j$(getconf _NPROCESSORS_ONLN) \
687-
&& make install \
679+
# Installation: Version specific
680+
# Type: PECL extension
681+
# Default: Pecl command
682+
&& pecl install uploadprogress-1.1.4 \
688683
# Enabling
689684
&& docker-php-ext-enable uploadprogress \
690685
&& true

Dockerfiles/mods/Dockerfile-7.1

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -687,15 +687,10 @@ RUN set -eux \
687687

688688
# -------------------- Installing PHP Extension: uploadprogress --------------------
689689
RUN set -eux \
690-
# Installation: Generic
691-
# Type: GIT extension
692-
&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
693-
&& cd /tmp/uploadprogress \
694-
# Default: Install command
695-
&& phpize \
696-
&& ./configure --enable-uploadprogress \
697-
&& make -j$(getconf _NPROCESSORS_ONLN) \
698-
&& make install \
690+
# Installation: Version specific
691+
# Type: PECL extension
692+
# Default: Pecl command
693+
&& pecl install uploadprogress-1.1.4 \
699694
# Enabling
700695
&& docker-php-ext-enable uploadprogress \
701696
&& true

Dockerfiles/mods/Dockerfile-7.2

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -691,14 +691,9 @@ RUN set -eux \
691691
# -------------------- Installing PHP Extension: uploadprogress --------------------
692692
RUN set -eux \
693693
# Installation: Generic
694-
# Type: GIT extension
695-
&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
696-
&& cd /tmp/uploadprogress \
697-
# Default: Install command
698-
&& phpize \
699-
&& ./configure --enable-uploadprogress \
700-
&& make -j$(getconf _NPROCESSORS_ONLN) \
701-
&& make install \
694+
# Type: PECL extension
695+
# Default: Pecl command
696+
&& pecl install uploadprogress \
702697
# Enabling
703698
&& docker-php-ext-enable uploadprogress \
704699
&& true

Dockerfiles/mods/Dockerfile-7.3

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -681,14 +681,9 @@ RUN set -eux \
681681
# -------------------- Installing PHP Extension: uploadprogress --------------------
682682
RUN set -eux \
683683
# Installation: Generic
684-
# Type: GIT extension
685-
&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
686-
&& cd /tmp/uploadprogress \
687-
# Default: Install command
688-
&& phpize \
689-
&& ./configure --enable-uploadprogress \
690-
&& make -j$(getconf _NPROCESSORS_ONLN) \
691-
&& make install \
684+
# Type: PECL extension
685+
# Default: Pecl command
686+
&& pecl install uploadprogress \
692687
# Enabling
693688
&& docker-php-ext-enable uploadprogress \
694689
&& true

Dockerfiles/mods/Dockerfile-7.4

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -675,14 +675,9 @@ RUN set -eux \
675675
# -------------------- Installing PHP Extension: uploadprogress --------------------
676676
RUN set -eux \
677677
# Installation: Generic
678-
# Type: GIT extension
679-
&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
680-
&& cd /tmp/uploadprogress \
681-
# Default: Install command
682-
&& phpize \
683-
&& ./configure --enable-uploadprogress \
684-
&& make -j$(getconf _NPROCESSORS_ONLN) \
685-
&& make install \
678+
# Type: PECL extension
679+
# Default: Pecl command
680+
&& pecl install uploadprogress \
686681
# Enabling
687682
&& docker-php-ext-enable uploadprogress \
688683
&& true

Dockerfiles/mods/Dockerfile-8.0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ RUN set -eux \
599599

600600
# -------------------- Installing PHP Extension: uploadprogress --------------------
601601
RUN set -eux \
602-
# Installation: Version specific
602+
# Installation: Generic
603603
# Type: PECL extension
604604
# Default: Pecl command
605605
&& pecl install uploadprogress \

Dockerfiles/mods/Dockerfile-8.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ RUN set -eux \
533533

534534
# -------------------- Installing PHP Extension: uploadprogress --------------------
535535
RUN set -eux \
536-
# Installation: Version specific
536+
# Installation: Generic
537537
# Type: PECL extension
538538
# Default: Pecl command
539539
&& pecl install uploadprogress \

build/ansible/group_vars/all/mods.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,14 +1123,14 @@ extensions_available:
11231123
5.6:
11241124
type: pecl
11251125
version: 1.1.4
1126-
8.0:
1126+
7.0:
11271127
type: pecl
1128-
8.1:
1128+
version: 1.1.4
1129+
7.1:
11291130
type: pecl
1131+
version: 1.1.4
11301132
all:
1131-
type: git
1132-
git_url: https://github.com/php/pecl-php-uploadprogress
1133-
configure: --enable-uploadprogress
1133+
type: pecl
11341134
vips:
11351135
disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.0, 8.1]
11361136
7.0:

0 commit comments

Comments
 (0)