Skip to content

Commit

Permalink
Merge pull request #63 from devilbox/release-0.49
Browse files Browse the repository at this point in the history
Fix igbinary for PHP 5.3
  • Loading branch information
cytopia authored Nov 10, 2018
2 parents 4d92554 + 1740392 commit 68615b2
Show file tree
Hide file tree
Showing 13 changed files with 637 additions and 693 deletions.
106 changes: 53 additions & 53 deletions Dockerfiles/mods/Dockerfile-5.2

Large diffs are not rendered by default.

157 changes: 59 additions & 98 deletions Dockerfiles/mods/Dockerfile-5.3

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions Dockerfiles/mods/Dockerfile-5.4

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions Dockerfiles/mods/Dockerfile-5.5

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions Dockerfiles/mods/Dockerfile-5.6

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions Dockerfiles/mods/Dockerfile-7.0

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions Dockerfiles/mods/Dockerfile-7.1

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions Dockerfiles/mods/Dockerfile-7.2

Large diffs are not rendered by default.

115 changes: 57 additions & 58 deletions Dockerfiles/mods/Dockerfile-7.3

Large diffs are not rendered by default.

111 changes: 55 additions & 56 deletions Dockerfiles/mods/Dockerfile-7.4

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions build/ansible/DOCKERFILES/Dockerfile-mods.j2
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ RUN set -x \
{# ---- 1.) Builtin ---- #}
{% if extensions_available[ext][php_version]['type'] == 'builtin' %}
{% if 'configure' in extensions_available[ext][php_version] %}
&& /usr/local/bin/docker-php-ext-configure {{ ext }} {{ extensions_available[ext][php_version]['configure'] }} >/dev/null \
&& /usr/local/bin/docker-php-ext-configure {{ ext }} {{ extensions_available[ext][php_version]['configure'] }} \
{% endif %}
&& /usr/local/bin/docker-php-ext-install{% if php_version != 5.4 %} -j$(getconf _NPROCESSORS_ONLN){% endif %} {{ ext }} >/dev/null \
&& /usr/local/bin/docker-php-ext-install{% if php_version != 5.4 %} -j$(getconf _NPROCESSORS_ONLN){% endif %} {{ ext }} \
{# ---- 2.) PECL ---- #}
{% elif extensions_available[ext][php_version]['type'] == 'pecl' %}
{% if 'command' in extensions_available[ext][php_version] %}
&& {{ extensions_available[ext][php_version]['command'] }} \
{% else %}
&& pecl install {{ ext }}{% if 'version' in extensions_available[ext][php_version] %}-{{ extensions_available[ext][php_version]['version'] }}{% endif %} >/dev/null\
&& pecl install {{ ext }}{% if 'version' in extensions_available[ext][php_version] %}-{{ extensions_available[ext][php_version]['version'] }}{% endif %} \
{% endif %}
&& docker-php-ext-enable {{ ext }} \
{# ---- 3.) GIT ---- #}
Expand All @@ -122,8 +122,8 @@ RUN set -x \
&& {{ extensions_available[ext][php_version]['command'] }} \
{% else %}
&& phpize \
&& ./configure {% if 'configure' in extensions_available[ext][php_version] %} {{ extensions_available[ext][php_version]['configure'] }}{% endif %} >/dev/null \
&& make -j$(getconf _NPROCESSORS_ONLN) >/dev/null \
&& ./configure {% if 'configure' in extensions_available[ext][php_version] %} {{ extensions_available[ext][php_version]['configure'] }}{% endif %} \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
{% endif %}
&& docker-php-ext-enable {{ ext }} \
Expand All @@ -136,15 +136,15 @@ RUN set -x \
{# ---- 1.) Builtin ---- #}
{% if extensions_available[ext]['all']['type'] == 'builtin' %}
{% if 'configure' in extensions_available[ext]['all'] %}
&& /usr/local/bin/docker-php-ext-configure {{ ext }} {{ extensions_available[ext]['all']['configure'] }} >/dev/null \
&& /usr/local/bin/docker-php-ext-configure {{ ext }} {{ extensions_available[ext]['all']['configure'] }} \
{% endif %}
&& /usr/local/bin/docker-php-ext-install{% if php_version != 5.4 %} -j$(getconf _NPROCESSORS_ONLN){% endif %} {{ ext }} >/dev/null \
&& /usr/local/bin/docker-php-ext-install{% if php_version != 5.4 %} -j$(getconf _NPROCESSORS_ONLN){% endif %} {{ ext }} \
{# ---- 2.) PECL ---- #}
{% elif extensions_available[ext]['all']['type'] == 'pecl' %}
{% if 'command' in extensions_available[ext]['all'] %}
&& {{ extensions_available[ext]['all']['command'] }} \
{% else %}
&& pecl install {{ ext }}{% if 'version' in extensions_available[ext]['all'] %}-{{ extensions_available[ext]['all']['version'] }}{% endif %} >/dev/null \
&& pecl install {{ ext }}{% if 'version' in extensions_available[ext]['all'] %}-{{ extensions_available[ext]['all']['version'] }}{% endif %} \
{% endif %}
&& docker-php-ext-enable {{ ext }} \
{# ---- 3.) GIT ---- #}
Expand All @@ -158,8 +158,8 @@ RUN set -x \
&& {{ extensions_available[ext]['all']['command'] }} \
{% else %}
&& phpize \
&& ./configure {% if 'configure' in extensions_available[ext]['all'] %} {{ extensions_available[ext]['all']['configure'] }}{% endif %} >/dev/null \
&& make -j$(getconf _NPROCESSORS_ONLN) >/dev/null \
&& ./configure {% if 'configure' in extensions_available[ext]['all'] %} {{ extensions_available[ext]['all']['configure'] }}{% endif %} \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
{% endif %}
&& docker-php-ext-enable {{ ext }} \
Expand Down
69 changes: 27 additions & 42 deletions build/ansible/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ extensions_available:
run_dep: [librabbitmq1]
all:
type: pecl
command: echo "/usr" | pecl install amqp >/dev/null
command: echo "/usr" | pecl install amqp
build_dep: [librabbitmq-dev]
run_dep: [librabbitmq4]
apcu:
Expand Down Expand Up @@ -843,7 +843,7 @@ extensions_available:
enchant:
5.2:
type: pecl
command: echo "/usr" | pecl install enchant >/dev/null
command: echo "/usr" | pecl install enchant
all:
type: builtin
build_dep: [libenchant-dev]
Expand Down Expand Up @@ -942,14 +942,13 @@ extensions_available:
5.2:
type: pecl
version: 2.0.7
5.3:
type: pecl
version: 2.0.7
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]
Expand Down Expand Up @@ -997,7 +996,7 @@ extensions_available:
EXTENSION_DIR="$( php -i | grep ^extension_dir | awk -F '=>' '{print $2}' | xargs )" \
&& if [ ! -d "${EXTENSION_DIR}" ]; then mkdir -p "${EXTENSION_DIR}"; fi \
&& curl https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz -L -o ioncube.tar.gz \
&& tar xvfz ioncube.tar.gz >/dev/null \
&& tar xvfz ioncube.tar.gz \
&& cd ioncube \
&& cp "ioncube_loader_lin_{{ php_version }}.so" "${EXTENSION_DIR}/ioncube.so" \
&& cd ../ \
Expand Down Expand Up @@ -1071,12 +1070,12 @@ extensions_available:
type: git
git_url: https://github.com/php-memcached-dev/php-memcached
git_ref: master
command: phpize && ./configure --enable-memcached >/dev/null && make -j$(getconf _NPROCESSORS_ONLN) >/dev/null && make install
command: phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install
7.4:
type: git
git_url: https://github.com/php-memcached-dev/php-memcached
git_ref: master
command: phpize && ./configure --enable-memcached >/dev/null && make -j$(getconf _NPROCESSORS_ONLN) >/dev/null && make install
command: phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install
all:
type: pecl
build_dep: [zlib1g-dev, libmemcached-dev]
Expand All @@ -1085,16 +1084,13 @@ extensions_available:
disabled: [7.0, 7.1, 7.2, 7.3, 7.4] # Deprecated
5.2:
type: pecl
command: yes | pecl install mongo-1.5.8 >/dev/null
command: yes | pecl install mongo-1.5.8
all:
type: pecl
command: yes | pecl install mongo > /dev/null
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
Expand Down Expand Up @@ -1143,13 +1139,13 @@ extensions_available:
opcache:
5.2:
type: pecl
command: pecl install zendopcache >/dev/null
command: pecl install zendopcache
5.3:
type: pecl
command: pecl install zendopcache >/dev/null
command: pecl install zendopcache
5.4:
type: pecl
command: pecl install zendopcache >/dev/null
command: pecl install zendopcache
all:
type: builtin
openssl:
Expand Down Expand Up @@ -1205,17 +1201,12 @@ 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 >/dev/null
disabled: [5.2, 5.3, 7.3, 7.4]
5.4:
type: git
git_url: https://github.com/phalcon/cphalcon
git_ref: phalcon-v2.0.13
command: cd build && ./install >/dev/null
command: cd build && ./install
# 7.3:
# type: git
# git_url: https://github.com/phalcon/cphalcon
Expand All @@ -1226,7 +1217,7 @@ extensions_available:
type: git
git_url: https://github.com/phalcon/cphalcon
git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g')
command: cd build && ./install >/dev/null
command: cd build && ./install
phar:
# https://github.com/docker-library/php/issues/618
disabled: [5.6, 7.0] # TODO: Currently disabled due to bug in built
Expand Down Expand Up @@ -1270,8 +1261,8 @@ extensions_available:
&& sed -i'' 's/ZEND_ACC_CTOR | //g' redis.c \
&& sed -i'' 's/ZEND_ACC_DTOR | //g' redis.c \
&& sed -i'' 's/ZEND_ACC_CTOR | //g' redis_cluster.c \
&& ./configure >/dev/null \
&& make -j$(getconf _NPROCESSORS_ONLN) >/dev/null \
&& ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
all:
type: pecl
Expand Down Expand Up @@ -1320,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
Expand All @@ -1344,11 +1331,11 @@ extensions_available:
git checkout $(git describe --abbrev=0 --tags) \
&& git submodule update --init --recursive \
#`&& cd thirdparty/hiredis` \
#`&& make -j$(getconf _NPROCESSORS_ONLN) >/dev/null` \
#`&& make -j$(getconf _NPROCESSORS_ONLN)` \
#`&& make install` \
#`&& cd ../../` \
&& cd thirdparty/nghttp2 \
&& cmake . >/dev/null \
&& cmake . \
&& make install \
&& ldconfig \
&& cd ../.. \
Expand All @@ -1373,8 +1360,7 @@ extensions_available:
#`--enable-http2` \
#`--enable-sockets` \
#`--with-libpq-dir=/usr/include/postgresql/libpq/` \
>/dev/null \
&& make -j$(getconf _NPROCESSORS_ONLN) >/dev/null \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
run_dep: [libnghttp2-14, libhiredis0.13]
build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, cmake]
Expand All @@ -1386,11 +1372,11 @@ extensions_available:
git checkout $(git describe --abbrev=0 --tags) \
&& git submodule update --init --recursive \
#`&& cd thirdparty/hiredis` \
#`&& make -j$(getconf _NPROCESSORS_ONLN) >/dev/null` \
#`&& make -j$(getconf _NPROCESSORS_ONLN)` \
#`&& make install` \
#`&& cd ../../` \
&& cd thirdparty/nghttp2 \
&& cmake . >/dev/null \
&& cmake . \
&& make install \
&& ldconfig \
&& cd ../.. \
Expand All @@ -1415,8 +1401,7 @@ extensions_available:
#`--enable-http2` \
#`--enable-sockets` \
#`--with-libpq-dir=/usr/include/postgresql/libpq/` \
>/dev/null \
&& make -j$(getconf _NPROCESSORS_ONLN) >/dev/null \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
run_dep: [libnghttp2-14, libhiredis0.13]
build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, cmake]
Expand Down

0 comments on commit 68615b2

Please sign in to comment.