Skip to content

Commit fb7a3e8

Browse files
cytopiacytopia
authored
Merge pull request #135 from devilbox/release-0.94
Release 0.94
2 parents 7f01800 + dc7336f commit fb7a3e8

23 files changed

Lines changed: 350 additions & 76 deletions

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ RUN set -eux \
422422
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
423423
&& cd /tmp/phalcon \
424424
# Custom: Branch
425-
&& git checkout v3.4.2 \
425+
&& git checkout v3.4.4 \
426426
# Custom: Install command
427427
&& cd build && ./install \
428428
# Enabling

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ RUN set -eux \
4343
libtidy-dev \
4444
libvpx-dev \
4545
libwebp-dev \
46+
libwebp6 \
4647
libxml2-dev \
4748
libxpm-dev \
4849
libxslt-dev \
@@ -451,7 +452,7 @@ RUN set -eux \
451452
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
452453
&& cd /tmp/phalcon \
453454
# Custom: Branch
454-
&& git checkout v3.4.2 \
455+
&& git checkout v3.4.4 \
455456
# Custom: Install command
456457
&& cd build && ./install \
457458
# Enabling

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ RUN set -eux \
4343
libtidy-dev \
4444
libvpx-dev \
4545
libwebp-dev \
46+
libwebp6 \
4647
libxml2-dev \
4748
libxpm-dev \
4849
libxslt-dev \
@@ -476,7 +477,7 @@ RUN set -eux \
476477
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
477478
&& cd /tmp/phalcon \
478479
# Custom: Branch
479-
&& git checkout v3.4.2 \
480+
&& git checkout v3.4.4 \
480481
# Custom: Install command
481482
&& cd build && ./install \
482483
# Enabling

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ RUN set -eux \
4343
libtidy-dev \
4444
libvpx-dev \
4545
libwebp-dev \
46+
libwebp6 \
4647
libxml2-dev \
4748
libxpm-dev \
4849
libxslt-dev \
@@ -475,7 +476,7 @@ RUN set -eux \
475476
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
476477
&& cd /tmp/phalcon \
477478
# Custom: Branch
478-
&& git checkout v3.4.2 \
479+
&& git checkout v3.4.4 \
479480
# Custom: Install command
480481
&& cd build && ./install \
481482
# Enabling
@@ -752,6 +753,7 @@ RUN set -eux \
752753
libsybdb5 \
753754
libtidy5deb1 \
754755
libvpx5 \
756+
libwebp-dev \
755757
libwebp6 \
756758
libxpm4 \
757759
libxslt1.1 \

‎Dockerfiles/mods/Dockerfile-7.2‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ RUN set -eux \
4343
libtidy-dev \
4444
libvpx-dev \
4545
libwebp-dev \
46+
libwebp6 \
4647
libxml2-dev \
4748
libxpm-dev \
4849
libxslt-dev \
@@ -756,6 +757,7 @@ RUN set -eux \
756757
libsybdb5 \
757758
libtidy5deb1 \
758759
libvpx5 \
760+
libwebp-dev \
759761
libwebp6 \
760762
libxpm4 \
761763
libxslt1.1 \

‎Dockerfiles/mods/Dockerfile-7.3‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ RUN set -eux \
4545
libtidy-dev \
4646
libvpx-dev \
4747
libwebp-dev \
48+
libwebp6 \
4849
libxml2-dev \
4950
libxpm-dev \
5051
libxslt-dev \
@@ -70,6 +71,23 @@ RUN set -eux \
7071
echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
7172
fi
7273

74+
# -------------------- Installing PHP Extension: ioncube --------------------
75+
RUN set -eux \
76+
# Installation: Generic
77+
# Type: Custom extension
78+
&& EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
79+
&& if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
80+
&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz -L -o ioncube.tar.gz \
81+
&& tar xvfz ioncube.tar.gz \
82+
&& cd ioncube \
83+
&& cp "ioncube_loader_lin_7.3.so" "${EXTENSION_DIR}/ioncube.so" \
84+
&& cd ../ \
85+
&& rm -rf ioncube \
86+
&& rm -rf ioncube.tar.gz \
87+
\
88+
&& true
89+
90+
7391
# -------------------- Installing PHP Extension: amqp --------------------
7492
RUN set -eux \
7593
# Installation: Generic
@@ -737,6 +755,7 @@ RUN set -eux \
737755
libsybdb5 \
738756
libtidy5deb1 \
739757
libvpx5 \
758+
libwebp-dev \
740759
libwebp6 \
741760
libxpm4 \
742761
libxslt1.1 \

‎Dockerfiles/mods/Dockerfile-7.4‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN set -eux \
1515
freetds-dev \
1616
libaio-dev \
1717
libbz2-dev \
18+
libenchant-dev \
1819
libevent-dev \
1920
libfbclient2 \
2021
libffi-dev \
@@ -40,6 +41,7 @@ RUN set -eux \
4041
libtidy-dev \
4142
libvpx-dev \
4243
libwebp-dev \
44+
libwebp6 \
4345
libxml2-dev \
4446
libxpm-dev \
4547
libxslt-dev \
@@ -107,6 +109,14 @@ RUN set -eux \
107109
&& true
108110

109111

112+
# -------------------- Installing PHP Extension: enchant --------------------
113+
RUN set -eux \
114+
# Installation: Generic
115+
# Type: Built-in extension
116+
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \
117+
&& true
118+
119+
110120
# -------------------- Installing PHP Extension: exif --------------------
111121
RUN set -eux \
112122
# Installation: Generic
@@ -176,7 +186,7 @@ RUN set -eux \
176186

177187
# -------------------- Installing PHP Extension: imagick --------------------
178188
RUN set -eux \
179-
# Installation: Version specific
189+
# Installation: Generic
180190
# Type: PECL extension
181191
# Default: Pecl command
182192
&& pecl install imagick \
@@ -187,9 +197,8 @@ RUN set -eux \
187197

188198
# -------------------- Installing PHP Extension: intl --------------------
189199
RUN set -eux \
190-
# Installation: Version specific
200+
# Installation: Generic
191201
# Type: Built-in extension
192-
# Installation
193202
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \
194203
&& true
195204

@@ -410,10 +419,10 @@ RUN set -eux \
410419

411420
# -------------------- Installing PHP Extension: rdkafka --------------------
412421
RUN set -eux \
413-
# Installation: Version specific
422+
# Installation: Generic
414423
# Type: PECL extension
415424
# Default: Pecl command
416-
&& pecl install rdkafka-3.1.2 \
425+
&& pecl install rdkafka \
417426
# Enabling
418427
&& docker-php-ext-enable rdkafka \
419428
&& true
@@ -505,9 +514,8 @@ RUN set -eux \
505514

506515
# -------------------- Installing PHP Extension: tidy --------------------
507516
RUN set -eux \
508-
# Installation: Version specific
517+
# Installation: Generic
509518
# Type: Built-in extension
510-
# Installation
511519
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \
512520
&& true
513521

@@ -625,13 +633,14 @@ RUN set -eux \
625633
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
626634
libaio1 \
627635
libaspell15 \
636+
libenchant1c2a \
628637
libfbclient2 \
629638
libffi6 \
630639
libfreetype6 \
631-
libhiredis0.13 \
632-
libicu57 \
640+
libhiredis0.14 \
641+
libicu63 \
633642
libjpeg62-turbo \
634-
libmagickwand-6.q16-3 \
643+
libmagickwand-6.q16-6 \
635644
libmcrypt4 \
636645
libmemcachedutil2 \
637646
libnghttp2-14 \
@@ -640,8 +649,9 @@ RUN set -eux \
640649
librabbitmq4 \
641650
librdkafka1 \
642651
libsybdb5 \
643-
libtidy5 \
644-
libvpx4 \
652+
libtidy5deb1 \
653+
libvpx5 \
654+
libwebp-dev \
645655
libwebp6 \
646656
libxpm4 \
647657
libxslt1.1 \
@@ -701,6 +711,8 @@ RUN set -eux \
701711
&& php-fpm -m | grep -oiE '^dba$' \
702712
&& php -m | grep -oiE '^dom$' \
703713
&& php-fpm -m | grep -oiE '^dom$' \
714+
&& php -m | grep -oiE '^enchant$' \
715+
&& php-fpm -m | grep -oiE '^enchant$' \
704716
&& php -m | grep -oiE '^exif$' \
705717
&& php-fpm -m | grep -oiE '^exif$' \
706718
&& php -m | grep -oiE '^ffi$' \

‎Dockerfiles/mods/Dockerfile-8.0‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN set -eux \
1414
freetds-dev \
1515
libaio-dev \
1616
libbz2-dev \
17+
libenchant-dev \
1718
libevent-dev \
1819
libfbclient2 \
1920
libfreetype6-dev \
@@ -89,6 +90,14 @@ RUN set -eux \
8990
&& true
9091

9192

93+
# -------------------- Installing PHP Extension: enchant --------------------
94+
RUN set -eux \
95+
# Installation: Generic
96+
# Type: Built-in extension
97+
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \
98+
&& true
99+
100+
92101
# -------------------- Installing PHP Extension: exif --------------------
93102
RUN set -eux \
94103
# Installation: Generic
@@ -130,9 +139,8 @@ RUN set -eux \
130139

131140
# -------------------- Installing PHP Extension: intl --------------------
132141
RUN set -eux \
133-
# Installation: Version specific
142+
# Installation: Generic
134143
# Type: Built-in extension
135-
# Installation
136144
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \
137145
&& true
138146

@@ -444,9 +452,8 @@ RUN set -eux \
444452

445453
# -------------------- Installing PHP Extension: tidy --------------------
446454
RUN set -eux \
447-
# Installation: Version specific
455+
# Installation: Generic
448456
# Type: Built-in extension
449-
# Installation
450457
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \
451458
&& true
452459

@@ -560,17 +567,18 @@ RUN set -eux \
560567
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
561568
libaio1 \
562569
libaspell15 \
570+
libenchant1c2a \
563571
libfbclient2 \
564572
libffi6 \
565573
libfreetype6 \
566-
libicu57 \
574+
libicu63 \
567575
libjpeg62-turbo \
568576
libmemcachedutil2 \
569577
libpng16-16 \
570578
libpq5 \
571579
libsybdb5 \
572-
libtidy5 \
573-
libvpx4 \
580+
libtidy5deb1 \
581+
libvpx5 \
574582
libwebp6 \
575583
libxpm4 \
576584
libxslt1.1 \
@@ -628,6 +636,8 @@ RUN set -eux \
628636
&& php-fpm -m | grep -oiE '^dba$' \
629637
&& php -m | grep -oiE '^dom$' \
630638
&& php-fpm -m | grep -oiE '^dom$' \
639+
&& php -m | grep -oiE '^enchant$' \
640+
&& php-fpm -m | grep -oiE '^enchant$' \
631641
&& php -m | grep -oiE '^exif$' \
632642
&& php-fpm -m | grep -oiE '^exif$' \
633643
&& php -m | grep -oiE '^ffi$' \

‎Dockerfiles/work/Dockerfile-7.4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ RUN set -eux \
8787
mongodb-org-shell \
8888
mongodb-org-tools \
8989
moreutils \
90-
mysql-client \
90+
mariadb-client \
9191
nano \
9292
net-tools \
9393
netcat \
@@ -305,7 +305,7 @@ RUN set -eux \
305305
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
306306
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
307307
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
308-
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
308+
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
309309
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
310310
&& dpkg -i /tmp/wkhtmltopdf.deb \
311311
&& rm -f /tmp/wkhtmltopdf.deb \

‎Dockerfiles/work/Dockerfile-8.0‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ RUN set -eux \
8787
mongodb-org-shell \
8888
mongodb-org-tools \
8989
moreutils \
90-
mysql-client \
90+
mariadb-client \
9191
nano \
9292
net-tools \
9393
netcat \
@@ -243,7 +243,7 @@ RUN set -eux \
243243
&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
244244
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
245245
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
246-
libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
246+
libfontenc1 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
247247
&& curl -sS -L -o /tmp/wkhtmltopdf.deb https://github.com/${VERSION} \
248248
&& dpkg -i /tmp/wkhtmltopdf.deb \
249249
&& rm -f /tmp/wkhtmltopdf.deb \

0 commit comments

Comments
 (0)