Merge branch '2.5'

.gitignore

@@ -46,8 +46,8 @@
 /bin/*
 !bin/.ci/
 !bin/.travis/
-!bin/platformsh/
 !bin/console
+!bin/platformsh_prestart_cacheclear.sh
 !bin/vhost.sh
 
 .php~

.platform.app.yaml

@@ -139,7 +139,7 @@ hooks:
 
         # Now that mounts are available, clear cache on mount.
         # Note: Skip on PE Cluster setup using e.g. "if [$PLATFORM_BRANCH" != 'production']; then" & get p.sh to enable this on internal per node "pre_start" hook
-        sh bin/platformsh/pre_start-per_node-clear_cache.sh
+        sh bin/platformsh_prestart_cacheclear.sh
 
         # If you also need to clear Redis cache on every deploy, you can either use this command or redis-cli
         # Normally this should only be needed if cached data structures changes (upgrades), or you change data via sql (e.g. restore backup)

bin/platformsh/pre_start-per_node-clear_cache.sh → bin/platformsh_prestart_cacheclear.sh

@@ -5,8 +5,8 @@
 set -e
 
 #date
-echo "removing var/cache/${APP_ENV}/*.* to avoid Symfony container issues on interface changes"
-rm -Rf var/cache/${APP_ENV}/*.*
+echo "removing var/cache/${APP_ENV-dev}/*.* to avoid Symfony container issues on interface changes"
+rm -Rf var/cache/${APP_ENV-dev}/*.*
 #date
 echo "clearing application cache"
 php bin/console cache:clear