diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 20f07793..cd938b71 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -288,7 +288,7 @@ RUN set -x \ # ---- Installing PHP Extension: phalcon ---- && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ - && git checkout $(git describe --abbrev=0 --tags) \ + && git checkout v3.4.2 \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && (rm -rf /usr/local/lib/php/test/phalcon || true) \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 3d5ecd9b..4e358d32 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -292,7 +292,7 @@ RUN set -x \ # ---- Installing PHP Extension: phalcon ---- && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ - && git checkout $(git describe --abbrev=0 --tags) \ + && git checkout v3.4.2 \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && (rm -rf /usr/local/lib/php/test/phalcon || true) \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index cb11fa87..f20b5fdc 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -296,7 +296,7 @@ RUN set -x \ # ---- Installing PHP Extension: phalcon ---- && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ - && git checkout $(git describe --abbrev=0 --tags) \ + && git checkout v3.4.2 \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && (rm -rf /usr/local/lib/php/test/phalcon || true) \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 0296e5cb..3ce86360 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -291,7 +291,7 @@ RUN set -x \ # ---- Installing PHP Extension: phalcon ---- && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ - && git checkout $(git describe --abbrev=0 --tags) \ + && git checkout v3.4.2 \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && (rm -rf /usr/local/lib/php/test/phalcon || true) \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index e21fec87..efbea2f6 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -292,7 +292,7 @@ RUN set -x \ # ---- Installing PHP Extension: phalcon ---- && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ - && git checkout $(git describe --abbrev=0 --tags) \ + && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \ && cd build && ./install \ && docker-php-ext-enable phalcon \ && (rm -rf /usr/local/lib/php/test/phalcon || true) \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 5a72471f..b12988da 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -40,7 +40,6 @@ ENV BUILD_DEPS \ libnghttp2-dev \ libpng-dev \ libpq-dev \ - libpspell-dev \ librdkafka-dev \ librecode-dev \ libsasl2-dev \ @@ -60,7 +59,6 @@ ENV BUILD_DEPS \ git ENV RUN_DEPS \ - libaspell15 \ libc-client2007e \ libenchant1c2a \ libfbclient2 \ @@ -250,10 +248,14 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/pgsql || true) \ && (rm -rf /usr/local/lib/php/doc/pgsql || 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) \ - && (rm -rf /usr/local/lib/php/doc/pspell || true) \ +# ---- Installing PHP Extension: phalcon ---- + && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ + && cd /tmp/phalcon \ + && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \ + && 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: recode ---- && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \ @@ -500,12 +502,12 @@ RUN set -x \ && php-fpm -m | grep -oiE '^pdo_sqlsrv$' \ && 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$' \ && php-fpm -m | grep -oiE '^posix$' \ - && php -m | grep -oiE '^pspell$' \ - && php-fpm -m | grep -oiE '^pspell$' \ && php -m | grep -oiE '^readline$' \ && php-fpm -m | grep -oiE '^readline$' \ && php -m | grep -oiE '^recode$' \ diff --git a/README.md b/README.md index e887413a..aa535d78 100644 --- a/README.md +++ b/README.md @@ -566,7 +566,7 @@ Check out this table to see which Docker image provides what PHP modules. 7.3 Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib + apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib 7.4 diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 70d005db..eb32957e 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1222,7 +1222,7 @@ extensions_available: build_dep: [libpq-dev] run_dep: [libpq5] phalcon: - disabled: [5.2, 7.3, 7.4] + disabled: [5.2, 7.4] 5.3: type: git git_url: https://github.com/phalcon/cphalcon @@ -1233,17 +1233,30 @@ extensions_available: git_url: https://github.com/phalcon/cphalcon git_ref: phalcon-v2.0.13 command: cd build && ./install -# 7.3: -# 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') -# # TODO: Workaround to make it compile on PHP 7.3 -# command: cd build && echo > php7/64bits/phalcon.zep.c && ./install + 5.5: + type: git + git_url: https://github.com/phalcon/cphalcon + git_ref: v3.4.2 + command: cd build && ./install + 5.6: + type: git + git_url: https://github.com/phalcon/cphalcon + git_ref: v3.4.2 + command: cd build && ./install + 7.0: + type: git + git_url: https://github.com/phalcon/cphalcon + git_ref: v3.4.2 + command: cd build && ./install + 7.1: + type: git + git_url: https://github.com/phalcon/cphalcon + git_ref: v3.4.2 + command: cd build && ./install all: type: git git_url: https://github.com/phalcon/cphalcon - git_ref: $(git describe --abbrev=0 --tags) - #git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') + git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) command: cd build && ./install phar: # https://github.com/docker-library/php/issues/618 @@ -1259,7 +1272,7 @@ extensions_available: all: type: builtin pspell: - disabled: [7.0, 7.1, 7.2] # TODO: currently segfaults (https://bugs.php.net/bug.php?id=77099) + disabled: [7.0, 7.1, 7.2, 7.3] # TODO: currently segfaults (https://bugs.php.net/bug.php?id=77099) all: type: builtin build_dep: [libpspell-dev]