Fix automated build of PHP 5.3

devilbox · Nov 10, 2018 · 1740392 · 1740392
1 parent 427cc3f
commit 1740392
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 60 deletions.
diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3
@@ -32,10 +32,8 @@ ENV BUILD_DEPS \
 	libjpeg-dev \
 	libkrb5-dev \
 	libldap2-dev \
-	libmagickwand-dev \
 	libmcrypt-dev \
 	libmemcached-dev \
-	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -62,11 +60,9 @@ ENV RUN_DEPS \
 	libfreetype6 \
 	libicu52 \
 	libjpeg62-turbo \
-	libmagickwand-6.q16-2 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libmysqlclient18 \
-	libnghttp2-5 \
 	libpng12-0 \
 	libpq5 \
 	librabbitmq1 \
@@ -177,12 +173,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
 	\
-# ---- Installing PHP Extension: imagick ----
-	&& pecl install imagick-3.3.0 \
-	&& docker-php-ext-enable imagick \
-	&& (rm -rf /usr/local/lib/php/test/imagick || true) \
-	&& (rm -rf /usr/local/lib/php/doc/imagick || true) \
-	\
 # ---- Installing PHP Extension: imap ----
 	&& ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \
 	&& /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \
@@ -235,12 +225,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mongo || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mongo || true) \
 	\
-# ---- Installing PHP Extension: mongodb ----
-	&& pecl install mongodb-0.6.3 \
-	&& docker-php-ext-enable mongodb \
-	&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
-	&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
-	\
 # ---- Installing PHP Extension: msgpack ----
 	&& pecl install msgpack-0.5.7 \
 	&& docker-php-ext-enable msgpack \
@@ -290,15 +274,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pgsql || true) \
 	\
-# ---- Installing PHP Extension: phalcon ----
-	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
-	&& cd /tmp/phalcon \
-	&& git checkout phalcon-v2.0.9 \
-	&& cd build && ./install \
-	&& docker-php-ext-enable phalcon \
-	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
-	&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
-	\
 # ---- Installing PHP Extension: pspell ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
 	&& (rm -rf /usr/local/lib/php/test/pspell || true) \
@@ -338,12 +313,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/sockets || true) \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
-# ---- Installing PHP Extension: swoole ----
-	&& pecl install swoole-1.9.23 \
-	&& docker-php-ext-enable swoole \
-	&& (rm -rf /usr/local/lib/php/test/swoole || true) \
-	&& (rm -rf /usr/local/lib/php/doc/swoole || true) \
-	\
 # ---- Installing PHP Extension: sysvmsg ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \
 	&& (rm -rf /usr/local/lib/php/test/sysvmsg || true) \
@@ -474,8 +443,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^iconv$' \
 	&& php -m | grep -oiE '^igbinary$' \
 	&& php-fpm -m | grep -oiE '^igbinary$' \
-	&& php -m | grep -oiE '^imagick$' \
-	&& php-fpm -m | grep -oiE '^imagick$' \
 	&& php -m | grep -oiE '^imap$' \
 	&& php-fpm -m | grep -oiE '^imap$' \
 	&& php -m | grep -oiE '^interbase$' \
@@ -498,8 +465,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongo$' \
 	&& php-fpm -m | grep -oiE '^mongo$' \
-	&& php -m | grep -oiE '^mongodb$' \
-	&& php-fpm -m | grep -oiE '^mongodb$' \
 	&& php -m | grep -oiE '^msgpack$' \
 	&& php-fpm -m | grep -oiE '^msgpack$' \
 	&& php -m | grep -oiE '^mysql$' \
@@ -530,8 +495,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
-	&& php -m | grep -oiE '^phalcon$' \
-	&& php-fpm -m | grep -oiE '^phalcon$' \
 	&& php -m | grep -oiE '^phar$' \
 	&& php-fpm -m | grep -oiE '^phar$' \
 	&& php -m | grep -oiE '^posix$' \
@@ -556,8 +519,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^soap$' \
 	&& php -m | grep -oiE '^sockets$' \
 	&& php-fpm -m | grep -oiE '^sockets$' \
-	&& php -m | grep -oiE '^swoole$' \
-	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \

diff --git a/README.md b/README.md
@@ -531,7 +531,7 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>5.3</th>
    <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>
-   <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>
+   <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>
   </tr>
   <tr>
    <th>5.4</th>

diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
@@ -948,11 +948,7 @@ extensions_available:
     all:
       type: pecl
   imagick:
-    disabled: [5.2, 7.4]
-    5.3:
-      type: pecl
-      version: 3.3.0
-      run_dep: [libmagickwand-6.q16-2]
+    disabled: [5.2, 5.3, 7.4]
     5.4:
       type: pecl
       run_dep: [libmagickwand-6.q16-2]
@@ -1094,10 +1090,7 @@ extensions_available:
       command: yes | pecl install mongo
       build_dep: [libssl-dev, libsasl2-dev]
   mongodb:
-    disabled: [5.2]
-    5.3:
-      type: pecl
-      version: 0.6.3
+    disabled: [5.2, 5.3]
     5.4:
       type: pecl
       version: 1.2.11
@@ -1208,12 +1201,7 @@ extensions_available:
       build_dep: [libpq-dev]
       run_dep: [libpq5]
   phalcon:
-    disabled: [5.2, 7.3, 7.4]
-    5.3:
-      type: git
-      git_url: https://github.com/phalcon/cphalcon
-      git_ref: phalcon-v2.0.9
-      command: cd build && ./install
+    disabled: [5.2, 5.3, 7.3, 7.4]
     5.4:
       type: git
       git_url: https://github.com/phalcon/cphalcon
@@ -1323,11 +1311,7 @@ extensions_available:
   spl:
     disabled: "{{ php_all_versions }}" # TODO: Did not work
   swoole:
-    disabled: [5.2]
-    5.3:
-      type: pecl
-      version: 1.9.23
-      run_dep: [libnghttp2-5]
+    disabled: [5.2, 5.3]
     5.4:
       type: pecl
       version: 1.9.23