Skip to content

Commit 4fa6afe

Browse files
cytopiacytopia
authored
Merge pull request #76 from devilbox/release-0.57
Release 0.57
2 parents 1a5600f + 66a5ce7 commit 4fa6afe

File tree

12 files changed

+105
-102
lines changed

12 files changed

+105
-102
lines changed

‎Dockerfiles/mods/Dockerfile-5.2‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV BUILD_DEPS \
2424
libc-client-dev \
2525
libcurl4-openssl-dev \
2626
libenchant-dev \
27+
libevent-dev \
2728
libfbclient2 \
2829
libfreetype6-dev \
2930
libib-util \
@@ -202,6 +203,12 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype
202203
&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
203204
&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
204205
\
206+
# ---- Installing PHP Extension: msgpack ----
207+
&& pecl install msgpack-0.5.7 \
208+
&& docker-php-ext-enable msgpack \
209+
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
210+
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
211+
\
205212
# ---- Installing PHP Extension: memcache ----
206213
&& pecl install memcache \
207214
&& docker-php-ext-enable memcache \
@@ -220,12 +227,6 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype
220227
&& (rm -rf /usr/local/lib/php/test/mongo || true) \
221228
&& (rm -rf /usr/local/lib/php/doc/mongo || true) \
222229
\
223-
# ---- Installing PHP Extension: msgpack ----
224-
&& pecl install msgpack-0.5.7 \
225-
&& docker-php-ext-enable msgpack \
226-
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
227-
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
228-
\
229230
# ---- Installing PHP Extension: opcache ----
230231
&& pecl install zendopcache \
231232
&& docker-php-ext-enable opcache \
@@ -438,14 +439,14 @@ RUN set -x \
438439
&& php-fpm -m | grep -oiE '^mbstring$' \
439440
&& php -m | grep -oiE '^mcrypt$' \
440441
&& php-fpm -m | grep -oiE '^mcrypt$' \
442+
&& php -m | grep -oiE '^msgpack$' \
443+
&& php-fpm -m | grep -oiE '^msgpack$' \
441444
&& php -m | grep -oiE '^memcache$' \
442445
&& php-fpm -m | grep -oiE '^memcache$' \
443446
&& php -m | grep -oiE '^memcached$' \
444447
&& php-fpm -m | grep -oiE '^memcached$' \
445448
&& php -m | grep -oiE '^mongo$' \
446449
&& php-fpm -m | grep -oiE '^mongo$' \
447-
&& php -m | grep -oiE '^msgpack$' \
448-
&& php-fpm -m | grep -oiE '^msgpack$' \
449450
&& php -m | grep -oiE '^mysql$' \
450451
&& php-fpm -m | grep -oiE '^mysql$' \
451452
&& php -m | grep -oiE '^mysqli$' \

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV BUILD_DEPS \
2424
libc-client-dev \
2525
libcurl4-openssl-dev \
2626
libenchant-dev \
27+
libevent-dev \
2728
libfbclient2 \
2829
libfreetype6-dev \
2930
libgmp-dev \
@@ -217,6 +218,12 @@ RUN set -x \
217218
&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
218219
&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
219220
\
221+
# ---- Installing PHP Extension: msgpack ----
222+
&& pecl install msgpack-0.5.7 \
223+
&& docker-php-ext-enable msgpack \
224+
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
225+
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
226+
\
220227
# ---- Installing PHP Extension: memcache ----
221228
&& pecl install memcache \
222229
&& docker-php-ext-enable memcache \
@@ -241,12 +248,6 @@ RUN set -x \
241248
&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
242249
&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
243250
\
244-
# ---- Installing PHP Extension: msgpack ----
245-
&& pecl install msgpack-0.5.7 \
246-
&& docker-php-ext-enable msgpack \
247-
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
248-
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
249-
\
250251
# ---- Installing PHP Extension: mysqli ----
251252
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
252253
&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
@@ -492,6 +493,8 @@ RUN set -x \
492493
&& php-fpm -m | grep -oiE '^mbstring$' \
493494
&& php -m | grep -oiE '^mcrypt$' \
494495
&& php-fpm -m | grep -oiE '^mcrypt$' \
496+
&& php -m | grep -oiE '^msgpack$' \
497+
&& php-fpm -m | grep -oiE '^msgpack$' \
495498
&& php -m | grep -oiE '^memcache$' \
496499
&& php-fpm -m | grep -oiE '^memcache$' \
497500
&& php -m | grep -oiE '^memcached$' \
@@ -500,8 +503,6 @@ RUN set -x \
500503
&& php-fpm -m | grep -oiE '^mongo$' \
501504
&& php -m | grep -oiE '^mongodb$' \
502505
&& php-fpm -m | grep -oiE '^mongodb$' \
503-
&& php -m | grep -oiE '^msgpack$' \
504-
&& php-fpm -m | grep -oiE '^msgpack$' \
505506
&& php -m | grep -oiE '^mysql$' \
506507
&& php-fpm -m | grep -oiE '^mysql$' \
507508
&& php -m | grep -oiE '^mysqli$' \

‎Dockerfiles/mods/Dockerfile-5.4‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV BUILD_DEPS \
2424
libc-client-dev \
2525
libcurl4-openssl-dev \
2626
libenchant-dev \
27+
libevent-dev \
2728
libfbclient2 \
2829
libfreetype6-dev \
2930
libgmp-dev \
@@ -217,6 +218,12 @@ RUN set -x \
217218
&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
218219
&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
219220
\
221+
# ---- Installing PHP Extension: msgpack ----
222+
&& pecl install msgpack-0.5.7 \
223+
&& docker-php-ext-enable msgpack \
224+
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
225+
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
226+
\
220227
# ---- Installing PHP Extension: memcache ----
221228
&& pecl install memcache \
222229
&& docker-php-ext-enable memcache \
@@ -241,12 +248,6 @@ RUN set -x \
241248
&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
242249
&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
243250
\
244-
# ---- Installing PHP Extension: msgpack ----
245-
&& pecl install msgpack-0.5.7 \
246-
&& docker-php-ext-enable msgpack \
247-
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
248-
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
249-
\
250251
# ---- Installing PHP Extension: mysql ----
251252
&& /usr/local/bin/docker-php-ext-install mysql \
252253
&& (rm -rf /usr/local/lib/php/test/mysql || true) \
@@ -497,6 +498,8 @@ RUN set -x \
497498
&& php-fpm -m | grep -oiE '^mbstring$' \
498499
&& php -m | grep -oiE '^mcrypt$' \
499500
&& php-fpm -m | grep -oiE '^mcrypt$' \
501+
&& php -m | grep -oiE '^msgpack$' \
502+
&& php-fpm -m | grep -oiE '^msgpack$' \
500503
&& php -m | grep -oiE '^memcache$' \
501504
&& php-fpm -m | grep -oiE '^memcache$' \
502505
&& php -m | grep -oiE '^memcached$' \
@@ -505,8 +508,6 @@ RUN set -x \
505508
&& php-fpm -m | grep -oiE '^mongo$' \
506509
&& php -m | grep -oiE '^mongodb$' \
507510
&& php-fpm -m | grep -oiE '^mongodb$' \
508-
&& php -m | grep -oiE '^msgpack$' \
509-
&& php-fpm -m | grep -oiE '^msgpack$' \
510511
&& php -m | grep -oiE '^mysql$' \
511512
&& php-fpm -m | grep -oiE '^mysql$' \
512513
&& php -m | grep -oiE '^mysqli$' \

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV BUILD_DEPS \
2424
libc-client-dev \
2525
libcurl4-openssl-dev \
2626
libenchant-dev \
27+
libevent-dev \
2728
libfbclient2 \
2829
libfreetype6-dev \
2930
libgmp-dev \
@@ -207,6 +208,12 @@ RUN set -x \
207208
&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
208209
&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
209210
\
211+
# ---- Installing PHP Extension: msgpack ----
212+
&& pecl install msgpack-0.5.7 \
213+
&& docker-php-ext-enable msgpack \
214+
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
215+
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
216+
\
210217
# ---- Installing PHP Extension: memcache ----
211218
&& pecl install memcache \
212219
&& docker-php-ext-enable memcache \
@@ -231,12 +238,6 @@ RUN set -x \
231238
&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
232239
&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
233240
\
234-
# ---- Installing PHP Extension: msgpack ----
235-
&& pecl install msgpack-0.5.7 \
236-
&& docker-php-ext-enable msgpack \
237-
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
238-
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
239-
\
240241
# ---- Installing PHP Extension: mysql ----
241242
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
242243
&& (rm -rf /usr/local/lib/php/test/mysql || true) \
@@ -491,6 +492,8 @@ RUN set -x \
491492
&& php-fpm -m | grep -oiE '^mbstring$' \
492493
&& php -m | grep -oiE '^mcrypt$' \
493494
&& php-fpm -m | grep -oiE '^mcrypt$' \
495+
&& php -m | grep -oiE '^msgpack$' \
496+
&& php-fpm -m | grep -oiE '^msgpack$' \
494497
&& php -m | grep -oiE '^memcache$' \
495498
&& php-fpm -m | grep -oiE '^memcache$' \
496499
&& php -m | grep -oiE '^memcached$' \
@@ -499,8 +502,6 @@ RUN set -x \
499502
&& php-fpm -m | grep -oiE '^mongo$' \
500503
&& php -m | grep -oiE '^mongodb$' \
501504
&& php-fpm -m | grep -oiE '^mongodb$' \
502-
&& php -m | grep -oiE '^msgpack$' \
503-
&& php-fpm -m | grep -oiE '^msgpack$' \
504505
&& php -m | grep -oiE '^mysql$' \
505506
&& php-fpm -m | grep -oiE '^mysql$' \
506507
&& php -m | grep -oiE '^mysqli$' \

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV BUILD_DEPS \
2424
libc-client-dev \
2525
libcurl4-openssl-dev \
2626
libenchant-dev \
27+
libevent-dev \
2728
libfbclient2 \
2829
libfreetype6-dev \
2930
libgmp-dev \
@@ -211,6 +212,12 @@ RUN set -x \
211212
&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
212213
&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
213214
\
215+
# ---- Installing PHP Extension: msgpack ----
216+
&& pecl install msgpack-0.5.7 \
217+
&& docker-php-ext-enable msgpack \
218+
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
219+
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
220+
\
214221
# ---- Installing PHP Extension: memcache ----
215222
&& pecl install memcache \
216223
&& docker-php-ext-enable memcache \
@@ -235,12 +242,6 @@ RUN set -x \
235242
&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
236243
&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
237244
\
238-
# ---- Installing PHP Extension: msgpack ----
239-
&& pecl install msgpack-0.5.7 \
240-
&& docker-php-ext-enable msgpack \
241-
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
242-
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
243-
\
244245
# ---- Installing PHP Extension: mysql ----
245246
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
246247
&& (rm -rf /usr/local/lib/php/test/mysql || true) \
@@ -495,6 +496,8 @@ RUN set -x \
495496
&& php-fpm -m | grep -oiE '^mbstring$' \
496497
&& php -m | grep -oiE '^mcrypt$' \
497498
&& php-fpm -m | grep -oiE '^mcrypt$' \
499+
&& php -m | grep -oiE '^msgpack$' \
500+
&& php-fpm -m | grep -oiE '^msgpack$' \
498501
&& php -m | grep -oiE '^memcache$' \
499502
&& php-fpm -m | grep -oiE '^memcache$' \
500503
&& php -m | grep -oiE '^memcached$' \
@@ -503,8 +506,6 @@ RUN set -x \
503506
&& php-fpm -m | grep -oiE '^mongo$' \
504507
&& php -m | grep -oiE '^mongodb$' \
505508
&& php-fpm -m | grep -oiE '^mongodb$' \
506-
&& php -m | grep -oiE '^msgpack$' \
507-
&& php-fpm -m | grep -oiE '^msgpack$' \
508509
&& php -m | grep -oiE '^mysql$' \
509510
&& php-fpm -m | grep -oiE '^mysql$' \
510511
&& php -m | grep -oiE '^mysqli$' \

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV BUILD_DEPS \
2424
libc-client-dev \
2525
libcurl4-openssl-dev \
2626
libenchant-dev \
27+
libevent-dev \
2728
libfbclient2 \
2829
libfreetype6-dev \
2930
libgmp-dev \
@@ -210,6 +211,12 @@ RUN set -x \
210211
&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
211212
&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
212213
\
214+
# ---- Installing PHP Extension: msgpack ----
215+
&& pecl install msgpack \
216+
&& docker-php-ext-enable msgpack \
217+
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
218+
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
219+
\
213220
# ---- Installing PHP Extension: memcache ----
214221
&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
215222
&& cd /tmp/memcache \
@@ -222,7 +229,7 @@ RUN set -x \
222229
&& (rm -rf /usr/local/lib/php/doc/memcache || true) \
223230
\
224231
# ---- Installing PHP Extension: memcached ----
225-
&& pecl install memcached \
232+
&& pecl install memcached-3.0.4 \
226233
&& docker-php-ext-enable memcached \
227234
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
228235
&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
@@ -233,12 +240,6 @@ RUN set -x \
233240
&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
234241
&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
235242
\
236-
# ---- Installing PHP Extension: msgpack ----
237-
&& pecl install msgpack \
238-
&& docker-php-ext-enable msgpack \
239-
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
240-
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
241-
\
242243
# ---- Installing PHP Extension: mysqli ----
243244
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
244245
&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
@@ -498,14 +499,14 @@ RUN set -x \
498499
&& php-fpm -m | grep -oiE '^mbstring$' \
499500
&& php -m | grep -oiE '^mcrypt$' \
500501
&& php-fpm -m | grep -oiE '^mcrypt$' \
502+
&& php -m | grep -oiE '^msgpack$' \
503+
&& php-fpm -m | grep -oiE '^msgpack$' \
501504
&& php -m | grep -oiE '^memcache$' \
502505
&& php-fpm -m | grep -oiE '^memcache$' \
503506
&& php -m | grep -oiE '^memcached$' \
504507
&& php-fpm -m | grep -oiE '^memcached$' \
505508
&& php -m | grep -oiE '^mongodb$' \
506509
&& php-fpm -m | grep -oiE '^mongodb$' \
507-
&& php -m | grep -oiE '^msgpack$' \
508-
&& php-fpm -m | grep -oiE '^msgpack$' \
509510
&& php -m | grep -oiE '^mysqli$' \
510511
&& php-fpm -m | grep -oiE '^mysqli$' \
511512
&& php -m | grep -oiE '^mysqlnd$' \

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ ENV BUILD_DEPS \
2424
libc-client-dev \
2525
libcurl4-openssl-dev \
2626
libenchant-dev \
27+
libevent-dev \
2728
libfbclient2 \
2829
libfreetype6-dev \
2930
libgmp-dev \
@@ -210,6 +211,12 @@ RUN set -x \
210211
&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
211212
&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
212213
\
214+
# ---- Installing PHP Extension: msgpack ----
215+
&& pecl install msgpack \
216+
&& docker-php-ext-enable msgpack \
217+
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
218+
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
219+
\
213220
# ---- Installing PHP Extension: memcache ----
214221
&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
215222
&& cd /tmp/memcache \
@@ -222,7 +229,7 @@ RUN set -x \
222229
&& (rm -rf /usr/local/lib/php/doc/memcache || true) \
223230
\
224231
# ---- Installing PHP Extension: memcached ----
225-
&& pecl install memcached \
232+
&& pecl install memcached-3.0.4 \
226233
&& docker-php-ext-enable memcached \
227234
&& (rm -rf /usr/local/lib/php/test/memcached || true) \
228235
&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
@@ -233,12 +240,6 @@ RUN set -x \
233240
&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
234241
&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
235242
\
236-
# ---- Installing PHP Extension: msgpack ----
237-
&& pecl install msgpack \
238-
&& docker-php-ext-enable msgpack \
239-
&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
240-
&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
241-
\
242243
# ---- Installing PHP Extension: mysqli ----
243244
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
244245
&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
@@ -493,14 +494,14 @@ RUN set -x \
493494
&& php-fpm -m | grep -oiE '^mbstring$' \
494495
&& php -m | grep -oiE '^mcrypt$' \
495496
&& php-fpm -m | grep -oiE '^mcrypt$' \
497+
&& php -m | grep -oiE '^msgpack$' \
498+
&& php-fpm -m | grep -oiE '^msgpack$' \
496499
&& php -m | grep -oiE '^memcache$' \
497500
&& php-fpm -m | grep -oiE '^memcache$' \
498501
&& php -m | grep -oiE '^memcached$' \
499502
&& php-fpm -m | grep -oiE '^memcached$' \
500503
&& php -m | grep -oiE '^mongodb$' \
501504
&& php-fpm -m | grep -oiE '^mongodb$' \
502-
&& php -m | grep -oiE '^msgpack$' \
503-
&& php-fpm -m | grep -oiE '^msgpack$' \
504505
&& php -m | grep -oiE '^mysqli$' \
505506
&& php-fpm -m | grep -oiE '^mysqli$' \
506507
&& php -m | grep -oiE '^mysqlnd$' \

0 commit comments

Comments
 (0)