Merge pull request #119 from platformsh-templates/bug-114-115

closes #114  #115

.platform.app.yaml

@@ -81,10 +81,11 @@ hooks:
     deploy: |
         set -e
         php ./drush/platformsh_generate_drush_yml.php
-        cd web
-        drush -y cache-rebuild
-        drush -y updatedb
-        drush -y config-import
+        # if drupal is installed, will call the following drush commands:
+        #   - `cache-rebuild`
+        #   - `updatedb`
+        #   - and if config files are present, `config-import`
+        ./drush/platformsh_deploy_drupal.sh
 
 # The configuration of app when it is exposed to the web.
 web:
@@ -153,4 +154,4 @@ source:
     auto-update:
       command: |
         curl -fsS https://raw.githubusercontent.com/platformsh/source-operations/main/setup.sh | { bash /dev/fd/3 sop-autoupdate; } 3<&0
-    
+

drush/platformsh_deploy_drupal.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# We don't want to run drush commands if drupal isn't installed.
+# Similarly, we don't want to attempt to run config-import if there aren't any config files to import
+# @todo expand further to pass --uri for all sites, with an eye towards multisite
+#
+
+
+if [ -n "$(drush status bootstrap)" ]; then
+  drush -y cache-rebuild
+  drush -y updatedb
+  if [ -n "$(ls $(drush php:eval "echo realpath(Drupal\Core\Site\Settings::get('config_sync_directory'));")/*.yml 2>/dev/null)" ]; then
+    drush -y config-import
+  else
+    echo "No config to import. Skipping."
+  fi
+else
+  echo "Drupal not installed. Skipping standard Drupal deploy steps"
+fi