From eac2cc85e0c96eabe84374b4cd106582aa8686f7 Mon Sep 17 00:00:00 2001 From: Joe Corall Date: Sat, 18 May 2024 18:57:57 -0400 Subject: [PATCH] Have make production use same finalize as starter/starter-dev --- Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 4e1b740e9..212466da3 100644 --- a/Makefile +++ b/Makefile @@ -179,15 +179,7 @@ starter_dev: generate-secrets production: init $(MAKE) compose-up docker compose exec -T drupal with-contenv bash -lc 'composer install; chown -R nginx:nginx .' - $(MAKE) drupal-database update-settings-php - docker compose exec -T drupal with-contenv bash -lc "drush si -y --existing-config minimal --account-pass '$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)'" - docker-compose exec -T drupal with-contenv bash -lc "drush cr" - docker compose exec -T drupal with-contenv bash -lc "drush -l $(SITE) user:role:add fedoraadmin admin" - @echo "Checking if Solr's healthy" - docker-compose exec -T solr bash -c 'curl -s http://localhost:8983/solr/admin/info/system?wt=json' | jq -r .lucene || (echo "Solr is not healthy, waiting 10 seconds." && sleep 10) - MIGRATE_IMPORT_USER_OPTION=--userid=1 $(MAKE) hydrate - docker compose exec -T drupal with-contenv bash -lc 'drush -l $(SITE) migrate:import --userid=1 islandora_fits_tags' - $(MAKE) login + $(MAKE) starter-finalize ENVIRONMENT=starter ############################################# @@ -584,7 +576,10 @@ starter-finalize: docker compose exec -T drupal with-contenv bash -lc 'chown -R nginx:nginx . ; echo "Chown Complete"' $(MAKE) drupal-database update-settings-php docker compose exec -T drupal with-contenv bash -lc "drush si -y --existing-config minimal --account-pass '$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)'" + docker compose exec -T drupal with-contenv bash -lc "drush cr" docker compose exec -T drupal with-contenv bash -lc "drush -l $(SITE) user:role:add fedoraadmin admin" + @echo "Checking if Solr's healthy" + docker compose exec -T solr bash -c 'curl -s http://localhost:8983/solr/admin/info/system?wt=json' | jq -r .lucene || (echo "Solr is not healthy, waiting 10 seconds." && sleep 10) MIGRATE_IMPORT_USER_OPTION=--userid=1 $(MAKE) hydrate docker compose exec -T drupal with-contenv bash -lc 'drush -l $(SITE) migrate:import --userid=1 --tag=islandora' $(MAKE) login