Merge branch '2.5'

alongosz · Oct 1, 2019 · 4ca5b63 · 4ca5b63
2 parents d48ff2a + fa4d8a8
commit 4ca5b63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.platform.app.yaml b/.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
-        ./bin/platformsh/pre_start-per_node-clear_cache.sh
+        sh bin/platformsh/pre_start-per_node-clear_cache.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)

diff --git a/bin/platformsh/pre_start-per_node-clear_cache.sh b/bin/platformsh/pre_start-per_node-clear_cache.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env sh
 # This script is run as part of the .platform.app.yaml deployment step
 # On PE Cluster (usually just production) this should be setup by platform.sh team as part of pre_start event