Merge pull request #164 from magento-cloud/MAGECLOUD-5486

MAGECLOUD-5486: Magento 2.1 issues in magento-cloud-docker

Author: shiftedreality

images/php/7.1-cli/bin/cloud-deploy

@@ -10,7 +10,7 @@ run-hooks deploy
 
 # check that Varnish exists
 if ( varnish=$(curl -I varnish 2>&1 | grep -i "magento2") ); then
-    minor_magento_version=$(magento-command --version | sed "s/Magento CLI \([0-9]*\.[0-9]*\).*/\1/")
+    minor_magento_version=$(magento-command --version | sed "s/Magento CLI version \([0-9]*\.[0-9]*\).*/\1/")
     if [[ "$minor_magento_version" != "2.1" ]]; then
         output=$(magento-command config:set system/full_page_cache/caching_application 2)
         # as config:set does not return error code, we check output text to continue set varnish settings

images/php/7.1-cli/bin/magento-command

@@ -2,6 +2,6 @@
 
 [ "$DEBUG" = "true" ] && set -x
 
-MAGENTO_COMMAND="$MAGENTO_ROOT/bin/magento"
+MAGENTO_COMMAND="php $MAGENTO_ROOT/bin/magento"
 
 exec $MAGENTO_COMMAND "$@"

images/php/7.2-cli/bin/cloud-deploy

@@ -10,7 +10,7 @@ run-hooks deploy
 
 # check that Varnish exists
 if ( varnish=$(curl -I varnish 2>&1 | grep -i "magento2") ); then
-    minor_magento_version=$(magento-command --version | sed "s/Magento CLI \([0-9]*\.[0-9]*\).*/\1/")
+    minor_magento_version=$(magento-command --version | sed "s/Magento CLI version \([0-9]*\.[0-9]*\).*/\1/")
     if [[ "$minor_magento_version" != "2.1" ]]; then
         output=$(magento-command config:set system/full_page_cache/caching_application 2)
         # as config:set does not return error code, we check output text to continue set varnish settings

images/php/7.2-cli/bin/magento-command

@@ -2,6 +2,6 @@
 
 [ "$DEBUG" = "true" ] && set -x
 
-MAGENTO_COMMAND="$MAGENTO_ROOT/bin/magento"
+MAGENTO_COMMAND="php $MAGENTO_ROOT/bin/magento"
 
 exec $MAGENTO_COMMAND "$@"

images/php/7.3-cli/bin/cloud-deploy

@@ -10,7 +10,7 @@ run-hooks deploy
 
 # check that Varnish exists
 if ( varnish=$(curl -I varnish 2>&1 | grep -i "magento2") ); then
-    minor_magento_version=$(magento-command --version | sed "s/Magento CLI \([0-9]*\.[0-9]*\).*/\1/")
+    minor_magento_version=$(magento-command --version | sed "s/Magento CLI version \([0-9]*\.[0-9]*\).*/\1/")
     if [[ "$minor_magento_version" != "2.1" ]]; then
         output=$(magento-command config:set system/full_page_cache/caching_application 2)
         # as config:set does not return error code, we check output text to continue set varnish settings

images/php/7.3-cli/bin/magento-command

@@ -2,6 +2,6 @@
 
 [ "$DEBUG" = "true" ] && set -x
 
-MAGENTO_COMMAND="$MAGENTO_ROOT/bin/magento"
+MAGENTO_COMMAND="php $MAGENTO_ROOT/bin/magento"
 
 exec $MAGENTO_COMMAND "$@"

images/php/cli/bin/cloud-deploy

@@ -10,7 +10,7 @@ run-hooks deploy
 
 # check that Varnish exists
 if ( varnish=$(curl -I varnish 2>&1 | grep -i "magento2") ); then
-    minor_magento_version=$(magento-command --version | sed "s/Magento CLI \([0-9]*\.[0-9]*\).*/\1/")
+    minor_magento_version=$(magento-command --version | sed "s/Magento CLI version \([0-9]*\.[0-9]*\).*/\1/")
     if [[ "$minor_magento_version" != "2.1" ]]; then
         output=$(magento-command config:set system/full_page_cache/caching_application 2)
         # as config:set does not return error code, we check output text to continue set varnish settings

images/php/cli/bin/magento-command

@@ -2,6 +2,6 @@
 
 [ "$DEBUG" = "true" ] && set -x
 
-MAGENTO_COMMAND="$MAGENTO_ROOT/bin/magento"
+MAGENTO_COMMAND="php $MAGENTO_ROOT/bin/magento"
 
 exec $MAGENTO_COMMAND "$@"