From 41581bf9a3b15b8a735a9570c95ee10707a64155 Mon Sep 17 00:00:00 2001 From: cytopia Date: Tue, 15 May 2018 13:23:24 +0200 Subject: [PATCH] Disable photon in PHP 5.3/5.4 --- Dockerfiles/work/Dockerfile-5.3 | 5 ----- Dockerfiles/work/Dockerfile-5.4 | 5 ----- build/ansible/group_vars/all.yml | 1 + 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 03375ce..00ada80 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -187,10 +187,6 @@ RUN set -x \ && curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \ && chmod +x /usr/local/bin/phpcbf \ \ -# photon - && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ - \ # sass && gem install sass \ # webpack @@ -272,7 +268,6 @@ RUN set -x \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ - && photon --version | grep -E 'Installer [.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ && wp --allow-root --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 7992eb2..a552bfd 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -197,10 +197,6 @@ RUN set -x \ && curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \ && chmod +x /usr/local/bin/phpcbf \ \ -# photon - && COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \ -&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \ - \ # sass && gem install sass \ # symfony @@ -286,7 +282,6 @@ RUN set -x \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ - && photon --version | grep -E 'Installer [.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ && symfony --version | grep -E 'version\s*[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 44a4ca2..044d192 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -336,6 +336,7 @@ software_available: && chmod +x /usr/local/bin/phpcbf \ photon: check: photon --version | grep -E 'Installer [.0-9]+' + disabled: [5.3, 5.4] all: command: | COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \