Skip to content

Commit 1740392

Browse files
cytopiacytopia
committed
Fix automated build of PHP 5.3
1 parent 427cc3f commit 1740392

File tree

3 files changed

+5
-60
lines changed

3 files changed

+5
-60
lines changed

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ ENV BUILD_DEPS \
3232
libjpeg-dev \
3333
libkrb5-dev \
3434
libldap2-dev \
35-
libmagickwand-dev \
3635
libmcrypt-dev \
3736
libmemcached-dev \
38-
libnghttp2-dev \
3937
libpng-dev \
4038
libpq-dev \
4139
libpspell-dev \
@@ -62,11 +60,9 @@ ENV RUN_DEPS \
6260
libfreetype6 \
6361
libicu52 \
6462
libjpeg62-turbo \
65-
libmagickwand-6.q16-2 \
6663
libmcrypt4 \
6764
libmemcachedutil2 \
6865
libmysqlclient18 \
69-
libnghttp2-5 \
7066
libpng12-0 \
7167
libpq5 \
7268
librabbitmq1 \
@@ -177,12 +173,6 @@ RUN set -x \
177173
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
178174
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
179175
\
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-
\
186176
# ---- Installing PHP Extension: imap ----
187177
&& ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \
188178
&& /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \
@@ -235,12 +225,6 @@ RUN set -x \
235225
&& (rm -rf /usr/local/lib/php/test/mongo || true) \
236226
&& (rm -rf /usr/local/lib/php/doc/mongo || true) \
237227
\
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-
\
244228
# ---- Installing PHP Extension: msgpack ----
245229
&& pecl install msgpack-0.5.7 \
246230
&& docker-php-ext-enable msgpack \
@@ -290,15 +274,6 @@ RUN set -x \
290274
&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
291275
&& (rm -rf /usr/local/lib/php/doc/pgsql || true) \
292276
\
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 \
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-
\
302277
# ---- Installing PHP Extension: pspell ----
303278
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
304279
&& (rm -rf /usr/local/lib/php/test/pspell || true) \
@@ -338,12 +313,6 @@ RUN set -x \
338313
&& (rm -rf /usr/local/lib/php/test/sockets || true) \
339314
&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
340315
\
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-
\
347316
# ---- Installing PHP Extension: sysvmsg ----
348317
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \
349318
&& (rm -rf /usr/local/lib/php/test/sysvmsg || true) \
@@ -474,8 +443,6 @@ RUN set -x \
474443
&& php-fpm -m | grep -oiE '^iconv$' \
475444
&& php -m | grep -oiE '^igbinary$' \
476445
&& php-fpm -m | grep -oiE '^igbinary$' \
477-
&& php -m | grep -oiE '^imagick$' \
478-
&& php-fpm -m | grep -oiE '^imagick$' \
479446
&& php -m | grep -oiE '^imap$' \
480447
&& php-fpm -m | grep -oiE '^imap$' \
481448
&& php -m | grep -oiE '^interbase$' \
@@ -498,8 +465,6 @@ RUN set -x \
498465
&& php-fpm -m | grep -oiE '^memcached$' \
499466
&& php -m | grep -oiE '^mongo$' \
500467
&& php-fpm -m | grep -oiE '^mongo$' \
501-
&& php -m | grep -oiE '^mongodb$' \
502-
&& php-fpm -m | grep -oiE '^mongodb$' \
503468
&& php -m | grep -oiE '^msgpack$' \
504469
&& php-fpm -m | grep -oiE '^msgpack$' \
505470
&& php -m | grep -oiE '^mysql$' \
@@ -530,8 +495,6 @@ RUN set -x \
530495
&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
531496
&& php -m | grep -oiE '^pgsql$' \
532497
&& php-fpm -m | grep -oiE '^pgsql$' \
533-
&& php -m | grep -oiE '^phalcon$' \
534-
&& php-fpm -m | grep -oiE '^phalcon$' \
535498
&& php -m | grep -oiE '^phar$' \
536499
&& php-fpm -m | grep -oiE '^phar$' \
537500
&& php -m | grep -oiE '^posix$' \
@@ -556,8 +519,6 @@ RUN set -x \
556519
&& php-fpm -m | grep -oiE '^soap$' \
557520
&& php -m | grep -oiE '^sockets$' \
558521
&& php-fpm -m | grep -oiE '^sockets$' \
559-
&& php -m | grep -oiE '^swoole$' \
560-
&& php-fpm -m | grep -oiE '^swoole$' \
561522
&& php -m | grep -oiE '^sysvmsg$' \
562523
&& php-fpm -m | grep -oiE '^sysvmsg$' \
563524
&& 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, 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>
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>
535535
</tr>
536536
<tr>
537537
<th>5.4</th>

‎build/ansible/group_vars/all.yml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@ extensions_available:
948948
all:
949949
type: pecl
950950
imagick:
951-
disabled: [5.2, 7.4]
952-
5.3:
953-
type: pecl
954-
version: 3.3.0
955-
run_dep: [libmagickwand-6.q16-2]
951+
disabled: [5.2, 5.3, 7.4]
956952
5.4:
957953
type: pecl
958954
run_dep: [libmagickwand-6.q16-2]
@@ -1094,10 +1090,7 @@ extensions_available:
10941090
command: yes | pecl install mongo
10951091
build_dep: [libssl-dev, libsasl2-dev]
10961092
mongodb:
1097-
disabled: [5.2]
1098-
5.3:
1099-
type: pecl
1100-
version: 0.6.3
1093+
disabled: [5.2, 5.3]
11011094
5.4:
11021095
type: pecl
11031096
version: 1.2.11
@@ -1208,12 +1201,7 @@ extensions_available:
12081201
build_dep: [libpq-dev]
12091202
run_dep: [libpq5]
12101203
phalcon:
1211-
disabled: [5.2, 7.3, 7.4]
1212-
5.3:
1213-
type: git
1214-
git_url: https://github.com/phalcon/cphalcon
1215-
git_ref: phalcon-v2.0.9
1216-
command: cd build && ./install
1204+
disabled: [5.2, 5.3, 7.3, 7.4]
12171205
5.4:
12181206
type: git
12191207
git_url: https://github.com/phalcon/cphalcon
@@ -1323,11 +1311,7 @@ extensions_available:
13231311
spl:
13241312
disabled: "{{ php_all_versions }}" # TODO: Did not work
13251313
swoole:
1326-
disabled: [5.2]
1327-
5.3:
1328-
type: pecl
1329-
version: 1.9.23
1330-
run_dep: [libnghttp2-5]
1314+
disabled: [5.2, 5.3]
13311315
5.4:
13321316
type: pecl
13331317
version: 1.9.23

0 commit comments

Comments
 (0)