From c360bec7037441aa4202d824a59766f686da290e Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 21 Nov 2019 17:22:22 +0100 Subject: [PATCH] Update phalcon module --- Dockerfiles/mods/Dockerfile-5.5 | 2 +- Dockerfiles/mods/Dockerfile-5.6 | 2 +- Dockerfiles/mods/Dockerfile-7.0 | 2 +- Dockerfiles/mods/Dockerfile-7.1 | 2 +- Dockerfiles/mods/Dockerfile-7.4 | 17 +++++++++++++++++ build/ansible/group_vars/all/mods.yml | 10 +++++----- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 965a009..3e621b0 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -422,7 +422,7 @@ RUN set -eux \ && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ # Custom: Branch - && git checkout v3.4.2 \ + && git checkout v3.4.4 \ # Custom: Install command && cd build && ./install \ # Enabling diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 9f4d584..f3cbc0c 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -451,7 +451,7 @@ RUN set -eux \ && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ # Custom: Branch - && git checkout v3.4.2 \ + && git checkout v3.4.4 \ # Custom: Install command && cd build && ./install \ # Enabling diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 72279a7..e486da7 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -476,7 +476,7 @@ RUN set -eux \ && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ # Custom: Branch - && git checkout v3.4.2 \ + && git checkout v3.4.4 \ # Custom: Install command && cd build && ./install \ # Enabling diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 2803c89..dd084c8 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -475,7 +475,7 @@ RUN set -eux \ && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ # Custom: Branch - && git checkout v3.4.2 \ + && git checkout v3.4.4 \ # Custom: Install command && cd build && ./install \ # Enabling diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 3bb249b..14b2ca5 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -389,6 +389,21 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: phalcon -------------------- +RUN set -eux \ + # Installation: Generic + # Type: GIT extension + && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ + && cd /tmp/phalcon \ + # Custom: Branch + && 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) \ + # Custom: Install command + && cd build && ./install \ + # Enabling + && docker-php-ext-enable phalcon \ + && true + + # -------------------- Installing PHP Extension: pspell -------------------- RUN set -eux \ # Installation: Generic @@ -785,6 +800,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 '^phalcon$' \ + && php-fpm -m | grep -oiE '^phalcon$' \ && php -m | grep -oiE '^phar$' \ && php-fpm -m | grep -oiE '^phar$' \ && php -m | grep -oiE '^posix$' \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 8585945..6fee6de 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -731,7 +731,7 @@ extensions_available: build_dep: [libpq-dev] run_dep: [libpq5] phalcon: - disabled: [5.2, 7.4, 8.0] # TODO: currently disabled for 7.4 as it breaks + disabled: [5.2, 8.0] # TODO: currently disabled for 7.4 as it breaks 5.3: type: git git_url: https://github.com/phalcon/cphalcon @@ -745,22 +745,22 @@ extensions_available: 5.5: type: git git_url: https://github.com/phalcon/cphalcon - git_ref: v3.4.2 + git_ref: v3.4.4 command: cd build && ./install 5.6: type: git git_url: https://github.com/phalcon/cphalcon - git_ref: v3.4.2 + git_ref: v3.4.4 command: cd build && ./install 7.0: type: git git_url: https://github.com/phalcon/cphalcon - git_ref: v3.4.2 + git_ref: v3.4.4 command: cd build && ./install 7.1: type: git git_url: https://github.com/phalcon/cphalcon - git_ref: v3.4.2 + git_ref: v3.4.4 command: cd build && ./install all: type: git