Skip to content

Commit 7f01800

Browse files
cytopiacytopia
authored
Merge pull request #134 from devilbox/release-0.93
Release 0.93
2 parents b35f3a8 + 7f3a6f3 commit 7f01800

28 files changed

+427
-63
lines changed

‎Dockerfiles/mods/Dockerfile-5.3

-15
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ RUN set -eux \
2626
libjpeg-dev \
2727
libkrb5-dev \
2828
libldap2-dev \
29-
libmagickwand-dev \
3029
libmcrypt-dev \
3130
libmemcached-dev \
3231
libnghttp2-dev \
@@ -203,17 +202,6 @@ RUN set -eux \
203202
&& true
204203

205204

206-
# -------------------- Installing PHP Extension: imagick --------------------
207-
RUN set -eux \
208-
# Installation: Version specific
209-
# Type: PECL extension
210-
# Default: Pecl command
211-
&& pecl install imagick-3.3.0 \
212-
# Enabling
213-
&& docker-php-ext-enable imagick \
214-
&& true
215-
216-
217205
# -------------------- Installing PHP Extension: imap --------------------
218206
RUN set -eux \
219207
# Generic pre-command
@@ -689,7 +677,6 @@ RUN set -eux \
689677
libfreetype6 \
690678
libicu52 \
691679
libjpeg62-turbo \
692-
libmagickwand-6.q16-2 \
693680
libmcrypt4 \
694681
libmemcachedutil2 \
695682
libmysqlclient18 \
@@ -783,8 +770,6 @@ RUN set -eux \
783770
&& php-fpm -m | grep -oiE '^iconv$' \
784771
&& php -m | grep -oiE '^igbinary$' \
785772
&& php-fpm -m | grep -oiE '^igbinary$' \
786-
&& php -m | grep -oiE '^imagick$' \
787-
&& php-fpm -m | grep -oiE '^imagick$' \
788773
&& php -m | grep -oiE '^imap$' \
789774
&& php-fpm -m | grep -oiE '^imap$' \
790775
&& php -m | grep -oiE '^interbase$' \

‎Dockerfiles/mods/Dockerfile-5.4

-15
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ RUN set -eux \
2626
libjpeg-dev \
2727
libkrb5-dev \
2828
libldap2-dev \
29-
libmagickwand-dev \
3029
libmcrypt-dev \
3130
libmemcached-dev \
3231
libnghttp2-dev \
@@ -203,17 +202,6 @@ RUN set -eux \
203202
&& true
204203

205204

206-
# -------------------- Installing PHP Extension: imagick --------------------
207-
RUN set -eux \
208-
# Installation: Version specific
209-
# Type: PECL extension
210-
# Default: Pecl command
211-
&& pecl install imagick \
212-
# Enabling
213-
&& docker-php-ext-enable imagick \
214-
&& true
215-
216-
217205
# -------------------- Installing PHP Extension: imap --------------------
218206
RUN set -eux \
219207
# Generic pre-command
@@ -697,7 +685,6 @@ RUN set -eux \
697685
libfreetype6 \
698686
libicu52 \
699687
libjpeg62-turbo \
700-
libmagickwand-6.q16-2 \
701688
libmcrypt4 \
702689
libmemcachedutil2 \
703690
libmysqlclient18 \
@@ -791,8 +778,6 @@ RUN set -eux \
791778
&& php-fpm -m | grep -oiE '^iconv$' \
792779
&& php -m | grep -oiE '^igbinary$' \
793780
&& php-fpm -m | grep -oiE '^igbinary$' \
794-
&& php -m | grep -oiE '^imagick$' \
795-
&& php-fpm -m | grep -oiE '^imagick$' \
796781
&& php -m | grep -oiE '^imap$' \
797782
&& php-fpm -m | grep -oiE '^imap$' \
798783
&& php -m | grep -oiE '^interbase$' \

‎Dockerfiles/mods/Dockerfile-5.5

-15
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ RUN set -eux \
2626
libjpeg-dev \
2727
libkrb5-dev \
2828
libldap2-dev \
29-
libmagickwand-dev \
3029
libmcrypt-dev \
3130
libmemcached-dev \
3231
libnghttp2-dev \
@@ -194,17 +193,6 @@ RUN set -eux \
194193
&& true
195194

196195

197-
# -------------------- Installing PHP Extension: imagick --------------------
198-
RUN set -eux \
199-
# Installation: Version specific
200-
# Type: PECL extension
201-
# Default: Pecl command
202-
&& pecl install imagick \
203-
# Enabling
204-
&& docker-php-ext-enable imagick \
205-
&& true
206-
207-
208196
# -------------------- Installing PHP Extension: imap --------------------
209197
RUN set -eux \
210198
# Generic pre-command
@@ -685,7 +673,6 @@ RUN set -eux \
685673
libfreetype6 \
686674
libicu52 \
687675
libjpeg62-turbo \
688-
libmagickwand-6.q16-2 \
689676
libmcrypt4 \
690677
libmemcachedutil2 \
691678
libmysqlclient18 \
@@ -779,8 +766,6 @@ RUN set -eux \
779766
&& php-fpm -m | grep -oiE '^iconv$' \
780767
&& php -m | grep -oiE '^igbinary$' \
781768
&& php-fpm -m | grep -oiE '^igbinary$' \
782-
&& php -m | grep -oiE '^imagick$' \
783-
&& php-fpm -m | grep -oiE '^imagick$' \
784769
&& php -m | grep -oiE '^imap$' \
785770
&& php-fpm -m | grep -oiE '^imap$' \
786771
&& php -m | grep -oiE '^interbase$' \

‎Dockerfiles/mods/Dockerfile-7.4

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ RUN set -eux \
139139
# Installation: Version specific
140140
# Type: Built-in extension
141141
# Custom: configure command
142-
&& docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv \
142+
&& docker-php-ext-configure gd --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype --enable-gd-jis-conv \
143143
# Installation
144144
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \
145145
&& true

‎Dockerfiles/mods/Dockerfile-8.0

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ RUN set -eux \
104104
# Installation: Version specific
105105
# Type: Built-in extension
106106
# Custom: configure command
107-
&& docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv \
107+
&& docker-php-ext-configure gd --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype --enable-gd-jis-conv \
108108
# Installation
109109
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \
110110
&& true

‎Dockerfiles/work/Dockerfile-5.2

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ RUN set -eux \
7272
git \
7373
git-flow \
7474
git-svn \
75+
ghostscript \
7576
graphviz \
7677
hostname \
7778
htop \

‎Dockerfiles/work/Dockerfile-5.3

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ RUN set -eux \
7272
git \
7373
git-flow \
7474
git-svn \
75+
ghostscript \
7576
graphviz \
7677
hostname \
7778
htop \

‎Dockerfiles/work/Dockerfile-5.4

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ RUN set -eux \
7272
git \
7373
git-flow \
7474
git-svn \
75+
ghostscript \
7576
graphviz \
7677
hostname \
7778
htop \

‎Dockerfiles/work/Dockerfile-5.5

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ RUN set -eux \
7272
git \
7373
git-flow \
7474
git-svn \
75+
ghostscript \
7576
graphviz \
7677
hostname \
7778
htop \

‎Dockerfiles/work/Dockerfile-5.6

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ RUN set -eux \
7171
git \
7272
git-flow \
7373
git-svn \
74+
ghostscript \
7475
graphviz \
7576
hostname \
7677
htop \

‎Dockerfiles/work/Dockerfile-7.0

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ RUN set -eux \
7171
git \
7272
git-flow \
7373
git-svn \
74+
ghostscript \
7475
graphviz \
7576
hostname \
7677
htop \

‎Dockerfiles/work/Dockerfile-7.1

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ RUN set -eux \
7171
git \
7272
git-flow \
7373
git-svn \
74+
ghostscript \
7475
graphviz \
7576
hostname \
7677
htop \

‎Dockerfiles/work/Dockerfile-7.2

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ RUN set -eux \
7171
git \
7272
git-flow \
7373
git-svn \
74+
ghostscript \
7475
graphviz \
7576
hostname \
7677
htop \

‎Dockerfiles/work/Dockerfile-7.3

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ RUN set -eux \
7171
git \
7272
git-flow \
7373
git-svn \
74+
ghostscript \
7475
graphviz \
7576
hostname \
7677
htop \

‎Dockerfiles/work/Dockerfile-7.4

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ RUN set -eux \
7171
git \
7272
git-flow \
7373
git-svn \
74+
ghostscript \
7475
graphviz \
7576
hostname \
7677
htop \

‎Dockerfiles/work/Dockerfile-8.0

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ RUN set -eux \
7171
git \
7272
git-flow \
7373
git-svn \
74+
ghostscript \
7475
graphviz \
7576
hostname \
7677
htop \

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -607,17 +607,17 @@ Check out this table to see which Docker image provides what PHP modules.
607607
<tr>
608608
<th>5.3</th>
609609
<td id="53-base">Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysql, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
610-
<td id="53-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
610+
<td id="53-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
611611
</tr>
612612
<tr>
613613
<th>5.4</th>
614614
<td id="54-base">Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
615-
<td id="54-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
615+
<td id="54-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
616616
</tr>
617617
<tr>
618618
<th>5.5</th>
619619
<td id="55-base">Core, ctype, curl, date, dom, ereg, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
620-
<td id="55-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
620+
<td id="55-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
621621
</tr>
622622
<tr>
623623
<th>5.6</th>

‎build/ansible/DOCKERFILES/Dockerfile-work.j2

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ RUN set -eux \
8585
git \
8686
git-flow \
8787
git-svn \
88+
ghostscript \
8889
graphviz \
8990
hostname \
9091
htop \

‎build/ansible/group_vars/all/mods.yml

+3-13
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,11 @@ extensions_available:
295295
configure: --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv
296296
7.4:
297297
type: builtin
298-
configure: --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv
298+
configure: --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype --enable-gd-jis-conv
299299
run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6]
300300
8.0:
301301
type: builtin
302-
configure: --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv
302+
configure: --enable-gd --with-webp --with-jpeg --with-xpm --with-freetype --enable-gd-jis-conv
303303
run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx4, libfreetype6, libwebp6]
304304
all:
305305
type: builtin
@@ -340,17 +340,7 @@ extensions_available:
340340
all:
341341
type: pecl
342342
imagick:
343-
disabled: [5.2, 8.0]
344-
5.3:
345-
type: pecl
346-
version: 3.3.0
347-
run_dep: [libmagickwand-6.q16-2]
348-
5.4:
349-
type: pecl
350-
run_dep: [libmagickwand-6.q16-2]
351-
5.5:
352-
type: pecl
353-
run_dep: [libmagickwand-6.q16-2]
343+
disabled: [5.2, 5.3, 5.4, 5.5, 8.0] # 5.3, 5.4 and 5.5 segfaults
354344
5.6:
355345
type: pecl
356346
run_dep: [libmagickwand-6.q16-3]

‎tests/mods/01-test-modules.sh

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
set -u
5+
set -o pipefail
6+
7+
CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
8+
9+
IMAGE="${1}"
10+
VERSION="${2}"
11+
FLAVOUR="${3}"
12+
13+
14+
# shellcheck disable=SC1090
15+
. "${CWD}/../.lib.sh"
16+
17+
18+
# -------------------------------------------------------------------------------------------------
19+
# Testing
20+
# -------------------------------------------------------------------------------------------------
21+
22+
ERROR=0
23+
for dir in $( ls -1 "${CWD}/modules/" ); do
24+
if ! "${CWD}/modules.sh" "${IMAGE}" "${VERSION}" "${FLAVOUR}" "${dir}"; then
25+
ERROR="$(( ERROR + 1 ))"
26+
fi
27+
done
28+
29+
exit "${ERROR}"

0 commit comments

Comments
 (0)