From 9c82fb08c3389ae768f31a90a37c2086b4b57c3f Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 27 Dec 2019 14:34:44 +0100 Subject: [PATCH] Fix Phalcon PHP module --- Dockerfiles/mods/Dockerfile-5.4 | 13 +++++++++++++ Dockerfiles/mods/Dockerfile-5.5 | 13 +++++++++++++ Dockerfiles/mods/Dockerfile-5.6 | 13 +++++++++++++ Dockerfiles/mods/Dockerfile-7.0 | 13 +++++++++++++ Dockerfiles/mods/Dockerfile-7.1 | 13 +++++++++++++ Dockerfiles/mods/Dockerfile-7.2 | 13 +++++++++++++ Dockerfiles/mods/Dockerfile-7.3 | 13 +++++++++++++ build/ansible/group_vars/all/mods.yml | 15 +++++++++++++++ 8 files changed, 106 insertions(+) diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index afac341..551a4fb 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -435,6 +435,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: psr -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install psr-0.5.1 \ + # Enabling + && docker-php-ext-enable psr \ + && true + + # -------------------- Installing PHP Extension: phalcon -------------------- RUN set -eux \ # Installation: Version specific @@ -836,6 +847,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^pdo_sqlite$' \ && php -m | grep -oiE '^pgsql$' \ && php-fpm -m | grep -oiE '^pgsql$' \ + && php -m | grep -oiE '^psr$' \ + && php-fpm -m | grep -oiE '^psr$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && php -m | grep -oiE '^phar$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 851c9ea..e00940f 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -415,6 +415,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: psr -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install psr-0.5.1 \ + # Enabling + && docker-php-ext-enable psr \ + && true + + # -------------------- Installing PHP Extension: phalcon -------------------- RUN set -eux \ # Installation: Version specific @@ -824,6 +835,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^pdo_sqlite$' \ && php -m | grep -oiE '^pgsql$' \ && php-fpm -m | grep -oiE '^pgsql$' \ + && php -m | grep -oiE '^psr$' \ + && php-fpm -m | grep -oiE '^psr$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && php -m | grep -oiE '^phar$' \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 657df1f..8ea7880 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -445,6 +445,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: psr -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install psr-0.6.0 \ + # Enabling + && docker-php-ext-enable psr \ + && true + + # -------------------- Installing PHP Extension: phalcon -------------------- RUN set -eux \ # Installation: Version specific @@ -858,6 +869,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^pdo_sqlite$' \ && php -m | grep -oiE '^pgsql$' \ && php-fpm -m | grep -oiE '^pgsql$' \ + && php -m | grep -oiE '^psr$' \ + && php-fpm -m | grep -oiE '^psr$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && php -m | grep -oiE '^phar$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 89a9903..de49a8e 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -463,6 +463,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: psr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install psr \ + # Enabling + && docker-php-ext-enable psr \ + && true + + # -------------------- Installing PHP Extension: phalcon -------------------- RUN set -eux \ # Installation: Version specific @@ -892,6 +903,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^pdo_sqlsrv$' \ && php -m | grep -oiE '^pgsql$' \ && php-fpm -m | grep -oiE '^pgsql$' \ + && php -m | grep -oiE '^psr$' \ + && php-fpm -m | grep -oiE '^psr$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && php -m | grep -oiE '^phar$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 94457ca..987a390 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -462,6 +462,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: psr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install psr \ + # Enabling + && docker-php-ext-enable psr \ + && true + + # -------------------- Installing PHP Extension: phalcon -------------------- RUN set -eux \ # Installation: Version specific @@ -891,6 +902,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^pdo_sqlsrv$' \ && php -m | grep -oiE '^pgsql$' \ && php-fpm -m | grep -oiE '^pgsql$' \ + && php -m | grep -oiE '^psr$' \ + && php-fpm -m | grep -oiE '^psr$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && php -m | grep -oiE '^phar$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index c2d0f36..02c35a0 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -466,6 +466,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: psr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install psr \ + # Enabling + && docker-php-ext-enable psr \ + && true + + # -------------------- Installing PHP Extension: phalcon -------------------- RUN set -eux \ # Installation: Generic @@ -895,6 +906,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^pdo_sqlsrv$' \ && php -m | grep -oiE '^pgsql$' \ && php-fpm -m | grep -oiE '^pgsql$' \ + && php -m | grep -oiE '^psr$' \ + && php-fpm -m | grep -oiE '^psr$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && php -m | grep -oiE '^phar$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 9217db2..7b83040 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -457,6 +457,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: psr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install psr \ + # Enabling + && docker-php-ext-enable psr \ + && true + + # -------------------- Installing PHP Extension: phalcon -------------------- RUN set -eux \ # Installation: Generic @@ -898,6 +909,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^pdo_sqlsrv$' \ && php -m | grep -oiE '^pgsql$' \ && php-fpm -m | grep -oiE '^pgsql$' \ + && php -m | grep -oiE '^psr$' \ + && php-fpm -m | grep -oiE '^psr$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && php -m | grep -oiE '^phar$' \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 61662e6..760fff5 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -71,6 +71,8 @@ extensions_enabled: - pdo_sqlite - pdo_sqlsrv - pgsql + - psr + # requires psr to be installed - phalcon - phar - posix @@ -719,6 +721,19 @@ extensions_available: type: builtin build_dep: [libpq-dev] run_dep: [libpq5] + psr: + disabled: [5.2, 5.3, 7.4, 8.0] # IMPORTANT: Required by PHP >= 7.2 by phalcon >=4.0 module + 5.4: + type: pecl + version: 0.5.1 + 5.5: + type: pecl + version: 0.5.1 + 5.6: + type: pecl + version: 0.6.0 # NOTE: 0.6.1 fails with: Package "psr" Version "0.6.1" does not have REST xml available + all: + type: pecl phalcon: disabled: [5.2, 7.4, 8.0] # TODO: currently disabled for 7.4 as it breaks 5.3: