Skip to content

Commit 8f53730

Browse files
cytopiacytopia
authored
Merge pull request #83 from devilbox/release-0.64
Release 0.64
2 parents 54a8258 + cb9826e commit 8f53730

28 files changed

Lines changed: 187 additions & 120 deletions

‎Dockerfiles/mods/Dockerfile-5.2‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ RUN set -x \
480480
&& php -m | grep -oiE '^pspell$' \
481481
&& php-fpm -m | grep -oiE '^pspell$' \
482482
&& php -m | grep -oiE '^readline$' \
483-
&& php-fpm -m | grep -oiE '^readline$' \
484483
&& php -m | grep -oiE '^recode$' \
485484
&& php-fpm -m | grep -oiE '^recode$' \
486485
&& php -m | grep -oiE '^redis$' \
@@ -499,6 +498,8 @@ RUN set -x \
499498
&& php-fpm -m | grep -oiE '^soap$' \
500499
&& php -m | grep -oiE '^sockets$' \
501500
&& php-fpm -m | grep -oiE '^sockets$' \
501+
&& php -m | grep -oiE '^spl$' \
502+
&& php-fpm -m | grep -oiE '^spl$' \
502503
&& php -m | grep -oiE '^sysvmsg$' \
503504
&& php-fpm -m | grep -oiE '^sysvmsg$' \
504505
&& php -m | grep -oiE '^sysvsem$' \

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ RUN set -x \
539539
&& php-fpm -m | grep -oiE '^posix$' \
540540
&& php -m | grep -oiE '^pspell$' \
541541
&& php-fpm -m | grep -oiE '^pspell$' \
542+
&& php -m | grep -oiE '^readline$' \
542543
&& php -m | grep -oiE '^recode$' \
543544
&& php-fpm -m | grep -oiE '^recode$' \
544545
&& php -m | grep -oiE '^redis$' \
@@ -559,6 +560,8 @@ RUN set -x \
559560
&& php-fpm -m | grep -oiE '^soap$' \
560561
&& php -m | grep -oiE '^sockets$' \
561562
&& php-fpm -m | grep -oiE '^sockets$' \
563+
&& php -m | grep -oiE '^spl$' \
564+
&& php-fpm -m | grep -oiE '^spl$' \
562565
&& php -m | grep -oiE '^swoole$' \
563566
&& php-fpm -m | grep -oiE '^swoole$' \
564567
&& php -m | grep -oiE '^sysvmsg$' \

‎Dockerfiles/mods/Dockerfile-5.4‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ RUN set -x \
545545
&& php -m | grep -oiE '^pspell$' \
546546
&& php-fpm -m | grep -oiE '^pspell$' \
547547
&& php -m | grep -oiE '^readline$' \
548-
&& php-fpm -m | grep -oiE '^readline$' \
549548
&& php -m | grep -oiE '^recode$' \
550549
&& php-fpm -m | grep -oiE '^recode$' \
551550
&& php -m | grep -oiE '^redis$' \
@@ -566,6 +565,8 @@ RUN set -x \
566565
&& php-fpm -m | grep -oiE '^soap$' \
567566
&& php -m | grep -oiE '^sockets$' \
568567
&& php-fpm -m | grep -oiE '^sockets$' \
568+
&& php -m | grep -oiE '^spl$' \
569+
&& php-fpm -m | grep -oiE '^spl$' \
569570
&& php -m | grep -oiE '^swoole$' \
570571
&& php-fpm -m | grep -oiE '^swoole$' \
571572
&& php -m | grep -oiE '^sysvmsg$' \

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,6 @@ RUN set -x \
539539
&& php -m | grep -oiE '^pspell$' \
540540
&& php-fpm -m | grep -oiE '^pspell$' \
541541
&& php -m | grep -oiE '^readline$' \
542-
&& php-fpm -m | grep -oiE '^readline$' \
543542
&& php -m | grep -oiE '^recode$' \
544543
&& php-fpm -m | grep -oiE '^recode$' \
545544
&& php -m | grep -oiE '^redis$' \
@@ -560,6 +559,8 @@ RUN set -x \
560559
&& php-fpm -m | grep -oiE '^soap$' \
561560
&& php -m | grep -oiE '^sockets$' \
562561
&& php-fpm -m | grep -oiE '^sockets$' \
562+
&& php -m | grep -oiE '^spl$' \
563+
&& php-fpm -m | grep -oiE '^spl$' \
563564
&& php -m | grep -oiE '^swoole$' \
564565
&& php-fpm -m | grep -oiE '^swoole$' \
565566
&& php -m | grep -oiE '^sysvmsg$' \

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,12 +536,13 @@ RUN set -x \
536536
&& php-fpm -m | grep -oiE '^pgsql$' \
537537
&& php -m | grep -oiE '^phalcon$' \
538538
&& php-fpm -m | grep -oiE '^phalcon$' \
539+
&& php -m | grep -oiE '^phar$' \
540+
&& php-fpm -m | grep -oiE '^phar$' \
539541
&& php -m | grep -oiE '^posix$' \
540542
&& php-fpm -m | grep -oiE '^posix$' \
541543
&& php -m | grep -oiE '^pspell$' \
542544
&& php-fpm -m | grep -oiE '^pspell$' \
543545
&& php -m | grep -oiE '^readline$' \
544-
&& php-fpm -m | grep -oiE '^readline$' \
545546
&& php -m | grep -oiE '^recode$' \
546547
&& php-fpm -m | grep -oiE '^recode$' \
547548
&& php -m | grep -oiE '^redis$' \
@@ -562,6 +563,8 @@ RUN set -x \
562563
&& php-fpm -m | grep -oiE '^soap$' \
563564
&& php -m | grep -oiE '^sockets$' \
564565
&& php-fpm -m | grep -oiE '^sockets$' \
566+
&& php -m | grep -oiE '^spl$' \
567+
&& php-fpm -m | grep -oiE '^spl$' \
565568
&& php -m | grep -oiE '^swoole$' \
566569
&& php-fpm -m | grep -oiE '^swoole$' \
567570
&& php -m | grep -oiE '^sysvmsg$' \

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ RUN set -x \
231231
&& (rm -rf /usr/local/lib/php/doc/memcache || true) \
232232
\
233233
# ---- Installing PHP Extension: memcached ----
234-
&& pecl install memcached-3.0.4 \
234+
&& pecl install memcached \
235235
&& docker-php-ext-enable memcached \
236236
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
237237
&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
@@ -257,11 +257,6 @@ RUN set -x \
257257
&& (rm -rf /usr/local/lib/php/test/pcntl || true) \
258258
&& (rm -rf /usr/local/lib/php/doc/pcntl || true) \
259259
\
260-
# ---- Installing PHP Extension: pdo ----
261-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \
262-
&& (rm -rf /usr/local/lib/php/test/pdo || true) \
263-
&& (rm -rf /usr/local/lib/php/doc/pdo || true) \
264-
\
265260
# ---- Installing PHP Extension: pdo_dblib ----
266261
&& ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \
267262
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \
@@ -551,12 +546,13 @@ RUN set -x \
551546
&& php-fpm -m | grep -oiE '^pgsql$' \
552547
&& php -m | grep -oiE '^phalcon$' \
553548
&& php-fpm -m | grep -oiE '^phalcon$' \
549+
&& php -m | grep -oiE '^phar$' \
550+
&& php-fpm -m | grep -oiE '^phar$' \
554551
&& php -m | grep -oiE '^posix$' \
555552
&& php-fpm -m | grep -oiE '^posix$' \
556553
&& php -m | grep -oiE '^pspell$' \
557554
&& php-fpm -m | grep -oiE '^pspell$' \
558555
&& php -m | grep -oiE '^readline$' \
559-
&& php-fpm -m | grep -oiE '^readline$' \
560556
&& php -m | grep -oiE '^recode$' \
561557
&& php-fpm -m | grep -oiE '^recode$' \
562558
&& php -m | grep -oiE '^redis$' \
@@ -577,6 +573,8 @@ RUN set -x \
577573
&& php-fpm -m | grep -oiE '^soap$' \
578574
&& php -m | grep -oiE '^sockets$' \
579575
&& php-fpm -m | grep -oiE '^sockets$' \
576+
&& php -m | grep -oiE '^spl$' \
577+
&& php-fpm -m | grep -oiE '^spl$' \
580578
&& php -m | grep -oiE '^sqlsrv$' \
581579
&& php-fpm -m | grep -oiE '^sqlsrv$' \
582580
&& php -m | grep -oiE '^swoole$' \

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ RUN set -x \
231231
&& (rm -rf /usr/local/lib/php/doc/memcache || true) \
232232
\
233233
# ---- Installing PHP Extension: memcached ----
234-
&& pecl install memcached-3.0.4 \
234+
&& pecl install memcached \
235235
&& docker-php-ext-enable memcached \
236236
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
237237
&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
@@ -553,7 +553,6 @@ RUN set -x \
553553
&& php -m | grep -oiE '^pspell$' \
554554
&& php-fpm -m | grep -oiE '^pspell$' \
555555
&& php -m | grep -oiE '^readline$' \
556-
&& php-fpm -m | grep -oiE '^readline$' \
557556
&& php -m | grep -oiE '^recode$' \
558557
&& php-fpm -m | grep -oiE '^recode$' \
559558
&& php -m | grep -oiE '^redis$' \
@@ -574,6 +573,8 @@ RUN set -x \
574573
&& php-fpm -m | grep -oiE '^soap$' \
575574
&& php -m | grep -oiE '^sockets$' \
576575
&& php-fpm -m | grep -oiE '^sockets$' \
576+
&& php -m | grep -oiE '^spl$' \
577+
&& php-fpm -m | grep -oiE '^spl$' \
577578
&& php -m | grep -oiE '^sqlsrv$' \
578579
&& php-fpm -m | grep -oiE '^sqlsrv$' \
579580
&& php -m | grep -oiE '^swoole$' \

‎Dockerfiles/mods/Dockerfile-7.2‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ RUN set -x \
232232
&& (rm -rf /usr/local/lib/php/doc/memcache || true) \
233233
\
234234
# ---- Installing PHP Extension: memcached ----
235-
&& pecl install memcached-3.0.4 \
235+
&& pecl install memcached \
236236
&& docker-php-ext-enable memcached \
237237
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
238238
&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
@@ -554,7 +554,6 @@ RUN set -x \
554554
&& php -m | grep -oiE '^pspell$' \
555555
&& php-fpm -m | grep -oiE '^pspell$' \
556556
&& php -m | grep -oiE '^readline$' \
557-
&& php-fpm -m | grep -oiE '^readline$' \
558557
&& php -m | grep -oiE '^recode$' \
559558
&& php-fpm -m | grep -oiE '^recode$' \
560559
&& php -m | grep -oiE '^redis$' \
@@ -577,6 +576,8 @@ RUN set -x \
577576
&& php-fpm -m | grep -oiE '^sockets$' \
578577
&& php -m | grep -oiE '^sodium$' \
579578
&& php-fpm -m | grep -oiE '^sodium$' \
579+
&& php -m | grep -oiE '^spl$' \
580+
&& php-fpm -m | grep -oiE '^spl$' \
580581
&& php -m | grep -oiE '^sqlsrv$' \
581582
&& php-fpm -m | grep -oiE '^sqlsrv$' \
582583
&& php -m | grep -oiE '^swoole$' \

‎Dockerfiles/mods/Dockerfile-7.3‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,14 @@ RUN set -x \
187187
&& (rm -rf /usr/local/lib/php/test/ldap || true) \
188188
&& (rm -rf /usr/local/lib/php/doc/ldap || true) \
189189
\
190+
# ---- Installing PHP Extension: msgpack ----
191+
&& pecl install msgpack \
192+
&& docker-php-ext-enable msgpack \
193+
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
194+
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
195+
\
190196
# ---- Installing PHP Extension: memcached ----
191-
&& git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \
192-
&& cd /tmp/memcached \
193-
&& git checkout master \
194-
&& phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install \
197+
&& pecl install memcached \
195198
&& docker-php-ext-enable memcached \
196199
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
197200
&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
@@ -477,6 +480,8 @@ RUN set -x \
477480
&& php-fpm -m | grep -oiE '^libxml$' \
478481
&& php -m | grep -oiE '^mbstring$' \
479482
&& php-fpm -m | grep -oiE '^mbstring$' \
483+
&& php -m | grep -oiE '^msgpack$' \
484+
&& php-fpm -m | grep -oiE '^msgpack$' \
480485
&& php -m | grep -oiE '^memcached$' \
481486
&& php-fpm -m | grep -oiE '^memcached$' \
482487
&& php -m | grep -oiE '^mongodb$' \
@@ -518,7 +523,6 @@ RUN set -x \
518523
&& php -m | grep -oiE '^pspell$' \
519524
&& php-fpm -m | grep -oiE '^pspell$' \
520525
&& php -m | grep -oiE '^readline$' \
521-
&& php-fpm -m | grep -oiE '^readline$' \
522526
&& php -m | grep -oiE '^recode$' \
523527
&& php-fpm -m | grep -oiE '^recode$' \
524528
&& php -m | grep -oiE '^redis$' \
@@ -541,6 +545,8 @@ RUN set -x \
541545
&& php-fpm -m | grep -oiE '^sockets$' \
542546
&& php -m | grep -oiE '^sodium$' \
543547
&& php-fpm -m | grep -oiE '^sodium$' \
548+
&& php -m | grep -oiE '^spl$' \
549+
&& php-fpm -m | grep -oiE '^spl$' \
544550
&& php -m | grep -oiE '^sqlsrv$' \
545551
&& php-fpm -m | grep -oiE '^sqlsrv$' \
546552
&& php -m | grep -oiE '^swoole$' \

‎Dockerfiles/mods/Dockerfile-7.4‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,6 @@ RUN set -x \
476476
&& php -m | grep -oiE '^pspell$' \
477477
&& php-fpm -m | grep -oiE '^pspell$' \
478478
&& php -m | grep -oiE '^readline$' \
479-
&& php-fpm -m | grep -oiE '^readline$' \
480479
&& php -m | grep -oiE '^recode$' \
481480
&& php-fpm -m | grep -oiE '^recode$' \
482481
&& php -m | grep -oiE '^redis$' \
@@ -499,6 +498,8 @@ RUN set -x \
499498
&& php-fpm -m | grep -oiE '^sockets$' \
500499
&& php -m | grep -oiE '^sodium$' \
501500
&& php-fpm -m | grep -oiE '^sodium$' \
501+
&& php -m | grep -oiE '^spl$' \
502+
&& php-fpm -m | grep -oiE '^spl$' \
502503
&& php -m | grep -oiE '^swoole$' \
503504
&& php-fpm -m | grep -oiE '^swoole$' \
504505
&& php -m | grep -oiE '^sysvmsg$' \

0 commit comments

Comments
 (0)