Skip to content

Commit 67776f6

Browse files
committed
fix: prevent infinite retries when installing Drupal outside DDEV/dev container
1 parent e7298ef commit 67776f6

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

.devpanel/init.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,14 @@ fi
5959
echo
6060
if [ -z "$(drush status --field=db-status)" ]; then
6161
echo 'Install Drupal.'
62-
until time drush -n si drupal_cms_installer installer_site_template_form.add_ons=drupal_cms_site_template_base; do
63-
:
64-
done
62+
# Outside DDEV/dev container, fail immediately on the first install error.
63+
if [ -z "${DRUPALFORGE_DEVCONTAINER:-}" ] && [ "${IS_DDEV_PROJECT:-}" != "true" ]; then
64+
time drush -n si drupal_cms_installer installer_site_template_form.add_ons=drupal_cms_site_template_base
65+
else
66+
until time drush -n si drupal_cms_installer installer_site_template_form.add_ons=drupal_cms_site_template_base; do
67+
:
68+
done
69+
fi
6570

6671
if grep '"drupal/core-recommended": "^11.3' composer.json &> /dev/null; then
6772
# Update to Drupal 11.4 after installation succeeds.

0 commit comments

Comments
 (0)