From 333297f8d7be1b17d9758eeabacaf0315dc11c3e Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 27 Dec 2018 16:30:59 +0100 Subject: [PATCH] Fix cphalcon for PHP 7.3 --- Dockerfiles/mods/Dockerfile-7.3 | 2 +- build/ansible/group_vars/all.yml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 0396db57..b12988da 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -251,7 +251,7 @@ RUN set -x \ # ---- 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' | tail -1) \ + && 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/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 25957271..eb32957e 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1253,11 +1253,6 @@ extensions_available: git_url: https://github.com/phalcon/cphalcon git_ref: v3.4.2 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 | sed 's/^.*tags\///g' | tail -1) - command: cd build && ./install all: type: git git_url: https://github.com/phalcon/cphalcon