From 4cc847eaa4b00ad6f47347983256b6926c83b2bb Mon Sep 17 00:00:00 2001
From: Philip Peterson <1326208+philip-peterson@users.noreply.github.com>
Date: Mon, 25 May 2026 12:38:44 -0700
Subject: [PATCH] Make config:import run unconditionally on every boot

config:import was gated behind IS_SETUP, so new config files added to
the sync directory were never applied on already-configured instances.
Move it outside the if/else so it always runs. Only module enables and
theme setup remain behind the first-time guard.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 docker/php/entrypoint.sh | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/docker/php/entrypoint.sh b/docker/php/entrypoint.sh
index ce5354d..e49ce59 100644
--- a/docker/php/entrypoint.sh
+++ b/docker/php/entrypoint.sh
@@ -33,7 +33,7 @@ if [ "$HAS_TABLES" != "1" ]; then
 fi
 
 if [ "$IS_SETUP" != "1" ]; then
-  echo "[entrypoint] Running setup (first boot or recovery from failed setup)..."
+  echo "[entrypoint] Running first-time setup..."
 
   $DRUSH en -y views views_ui field_ui text options link datetime && \
     echo "[entrypoint] Core modules enabled." || echo "[entrypoint] WARNING: core modules failed."
@@ -44,25 +44,18 @@ if [ "$IS_SETUP" != "1" ]; then
   $DRUSH en -y riverside_pt && \
     echo "[entrypoint] riverside_pt enabled." || echo "[entrypoint] WARNING: riverside_pt failed."
 
-  $DRUSH config:set system.site page.front /home -y && \
-    echo "[entrypoint] Front page set." || echo "[entrypoint] WARNING: front page config failed."
-
   $DRUSH theme:enable starterkit_theme claro_compact -y && \
     $DRUSH config:set system.theme default starterkit_theme -y && \
     $DRUSH config:set system.theme admin claro_compact -y && \
     echo "[entrypoint] Themes set." || echo "[entrypoint] WARNING: theme enable failed."
 
-  if ls /var/www/html/config/sync/*.yml >/dev/null 2>&1; then
-    echo "[entrypoint] Importing configuration from sync dir..."
-    $DRUSH config:import --partial -y || echo "[entrypoint] WARNING: config import failed."
-  fi
+  echo "[entrypoint] First-time setup complete."
+fi
 
-  echo "[entrypoint] Setup complete."
-else
-  echo "[entrypoint] Setup already complete, importing configuration..."
-  $DRUSH config:import -y >/dev/null 2>&1 && \
-    echo "[entrypoint] Config imported." || \
-    echo "[entrypoint] No config to import, continuing."
+if ls /var/www/html/config/sync/*.yml >/dev/null 2>&1; then
+  echo "[entrypoint] Importing configuration..."
+  $DRUSH config:import -y && \
+    echo "[entrypoint] Config imported." || echo "[entrypoint] WARNING: config import failed."
 fi
 
 npm run build --prefix /var/www/html >/dev/null 2>&1 && echo "[entrypoint] Tailwind built." || echo "[entrypoint] WARNING: Tailwind build failed."