Skip to content

Commit 77716db

Browse files
cytopiacytopia
authored
Merge pull request #64 from devilbox/release-0.50
Fix PHP 5.3 autoconf
2 parents 68615b2 + 62cc38d commit 77716db

File tree

3 files changed

+61
-9
lines changed

3 files changed

+61
-9
lines changed

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ ENV BUILD_DEPS \
3232
libjpeg-dev \
3333
libkrb5-dev \
3434
libldap2-dev \
35+
libmagickwand-dev \
3536
libmcrypt-dev \
3637
libmemcached-dev \
38+
libnghttp2-dev \
3739
libpng-dev \
3840
libpq-dev \
3941
libpspell-dev \
@@ -60,9 +62,11 @@ ENV RUN_DEPS \
6062
libfreetype6 \
6163
libicu52 \
6264
libjpeg62-turbo \
65+
libmagickwand-6.q16-2 \
6366
libmcrypt4 \
6467
libmemcachedutil2 \
6568
libmysqlclient18 \
69+
libnghttp2-5 \
6670
libpng12-0 \
6771
libpq5 \
6872
librabbitmq1 \
@@ -168,11 +172,17 @@ RUN set -x \
168172
&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
169173
\
170174
# ---- Installing PHP Extension: igbinary ----
171-
&& pecl install igbinary-2.0.7 \
175+
&& pecl install igbinary \
172176
&& docker-php-ext-enable igbinary \
173177
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
174178
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
175179
\
180+
# ---- Installing PHP Extension: imagick ----
181+
&& pecl install imagick-3.3.0 \
182+
&& docker-php-ext-enable imagick \
183+
&& (rm -rf /usr/local/lib/php/test/imagick || true) \
184+
&& (rm -rf /usr/local/lib/php/doc/imagick || true) \
185+
\
176186
# ---- Installing PHP Extension: imap ----
177187
&& ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \
178188
&& /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \
@@ -225,6 +235,12 @@ RUN set -x \
225235
&& (rm -rf /usr/local/lib/php/test/mongo || true) \
226236
&& (rm -rf /usr/local/lib/php/doc/mongo || true) \
227237
\
238+
# ---- Installing PHP Extension: mongodb ----
239+
&& pecl install mongodb-0.6.3 \
240+
&& docker-php-ext-enable mongodb \
241+
&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
242+
&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
243+
\
228244
# ---- Installing PHP Extension: msgpack ----
229245
&& pecl install msgpack-0.5.7 \
230246
&& docker-php-ext-enable msgpack \
@@ -274,6 +290,15 @@ RUN set -x \
274290
&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
275291
&& (rm -rf /usr/local/lib/php/doc/pgsql || true) \
276292
\
293+
# ---- Installing PHP Extension: phalcon ----
294+
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
295+
&& cd /tmp/phalcon \
296+
&& git checkout phalcon-v2.0.9 \
297+
&& cd build && ./install >/dev/null \
298+
&& docker-php-ext-enable phalcon \
299+
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
300+
&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
301+
\
277302
# ---- Installing PHP Extension: pspell ----
278303
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
279304
&& (rm -rf /usr/local/lib/php/test/pspell || true) \
@@ -313,6 +338,12 @@ RUN set -x \
313338
&& (rm -rf /usr/local/lib/php/test/sockets || true) \
314339
&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
315340
\
341+
# ---- Installing PHP Extension: swoole ----
342+
&& pecl install swoole-1.9.23 \
343+
&& docker-php-ext-enable swoole \
344+
&& (rm -rf /usr/local/lib/php/test/swoole || true) \
345+
&& (rm -rf /usr/local/lib/php/doc/swoole || true) \
346+
\
316347
# ---- Installing PHP Extension: sysvmsg ----
317348
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \
318349
&& (rm -rf /usr/local/lib/php/test/sysvmsg || true) \
@@ -443,6 +474,8 @@ RUN set -x \
443474
&& php-fpm -m | grep -oiE '^iconv$' \
444475
&& php -m | grep -oiE '^igbinary$' \
445476
&& php-fpm -m | grep -oiE '^igbinary$' \
477+
&& php -m | grep -oiE '^imagick$' \
478+
&& php-fpm -m | grep -oiE '^imagick$' \
446479
&& php -m | grep -oiE '^imap$' \
447480
&& php-fpm -m | grep -oiE '^imap$' \
448481
&& php -m | grep -oiE '^interbase$' \
@@ -465,6 +498,8 @@ RUN set -x \
465498
&& php-fpm -m | grep -oiE '^memcached$' \
466499
&& php -m | grep -oiE '^mongo$' \
467500
&& php-fpm -m | grep -oiE '^mongo$' \
501+
&& php -m | grep -oiE '^mongodb$' \
502+
&& php-fpm -m | grep -oiE '^mongodb$' \
468503
&& php -m | grep -oiE '^msgpack$' \
469504
&& php-fpm -m | grep -oiE '^msgpack$' \
470505
&& php -m | grep -oiE '^mysql$' \
@@ -495,6 +530,8 @@ RUN set -x \
495530
&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
496531
&& php -m | grep -oiE '^pgsql$' \
497532
&& php-fpm -m | grep -oiE '^pgsql$' \
533+
&& php -m | grep -oiE '^phalcon$' \
534+
&& php-fpm -m | grep -oiE '^phalcon$' \
498535
&& php -m | grep -oiE '^phar$' \
499536
&& php-fpm -m | grep -oiE '^phar$' \
500537
&& php -m | grep -oiE '^posix$' \
@@ -519,6 +556,8 @@ RUN set -x \
519556
&& php-fpm -m | grep -oiE '^soap$' \
520557
&& php -m | grep -oiE '^sockets$' \
521558
&& php-fpm -m | grep -oiE '^sockets$' \
559+
&& php -m | grep -oiE '^swoole$' \
560+
&& php-fpm -m | grep -oiE '^swoole$' \
522561
&& php -m | grep -oiE '^sysvmsg$' \
523562
&& php-fpm -m | grep -oiE '^sysvmsg$' \
524563
&& php -m | grep -oiE '^sysvsem$' \

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ Check out this table to see which Docker image provides what PHP modules.
531531
<tr>
532532
<th>5.3</th>
533533
<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>
534-
<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, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
534+
<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, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, 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>
535535
</tr>
536536
<tr>
537537
<th>5.4</th>

‎build/ansible/group_vars/all.yml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -942,13 +942,14 @@ extensions_available:
942942
5.2:
943943
type: pecl
944944
version: 2.0.7
945-
5.3:
946-
type: pecl
947-
version: 2.0.7
948945
all:
949946
type: pecl
950947
imagick:
951-
disabled: [5.2, 5.3, 7.4]
948+
disabled: [5.2, 7.4]
949+
5.3:
950+
type: pecl
951+
version: 3.3.0
952+
run_dep: [libmagickwand-6.q16-2]
952953
5.4:
953954
type: pecl
954955
run_dep: [libmagickwand-6.q16-2]
@@ -1090,7 +1091,10 @@ extensions_available:
10901091
command: yes | pecl install mongo
10911092
build_dep: [libssl-dev, libsasl2-dev]
10921093
mongodb:
1093-
disabled: [5.2, 5.3]
1094+
disabled: [5.2]
1095+
5.3:
1096+
type: pecl
1097+
version: 0.6.3
10941098
5.4:
10951099
type: pecl
10961100
version: 1.2.11
@@ -1201,7 +1205,12 @@ extensions_available:
12011205
build_dep: [libpq-dev]
12021206
run_dep: [libpq5]
12031207
phalcon:
1204-
disabled: [5.2, 5.3, 7.3, 7.4]
1208+
disabled: [5.2, 7.3, 7.4]
1209+
5.3:
1210+
type: git
1211+
git_url: https://github.com/phalcon/cphalcon
1212+
git_ref: phalcon-v2.0.9
1213+
command: cd build && ./install >/dev/null
12051214
5.4:
12061215
type: git
12071216
git_url: https://github.com/phalcon/cphalcon
@@ -1311,7 +1320,11 @@ extensions_available:
13111320
spl:
13121321
disabled: "{{ php_all_versions }}" # TODO: Did not work
13131322
swoole:
1314-
disabled: [5.2, 5.3]
1323+
disabled: [5.2]
1324+
5.3:
1325+
type: pecl
1326+
version: 1.9.23
1327+
run_dep: [libnghttp2-5]
13151328
5.4:
13161329
type: pecl
13171330
version: 1.9.23

0 commit comments

Comments
 (0)