Support #391

EDRN · Jan 27, 2025 · 9eba45e · 9eba45e
1 parent 92203f3
commit 9eba45e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/edrnsite.policy/src/edrnsite/policy/VERSION.txt b/src/edrnsite.policy/src/edrnsite/policy/VERSION.txt
@@ -1 +1 @@
-6.17.0
+6.18.0
diff --git a/support/cbiit-deploy-prod.sh b/support/cbiit-deploy-prod.sh
@@ -145,9 +145,7 @@ docker compose --project-name edrn start portal" || exit 1
 echo ""
 echo "🆙 Applying upgrades"
 ssh -q $USER@$WEBSERVER "cd $WEBROOT ; \
-docker compose --project-name edrn exec portal /usr/bin/django-admin copy_daily_hits_from_wagtailsearch &&\
-docker compose --project-name edrn exec portal /usr/bin/django-admin edrn_data_disclaimer &&\
-docker compose --project-name edrn exec portal /usr/bin/django-admin edrn_new_explorers" || exit 1
+docker compose --project-name edrn exec portal /usr/bin/django-admin copy_daily_hits_from_wagtailsearch" || exit 1
 
 echo ""
 echo "🤷‍♀️ Final portal restart and restart of search engine"

diff --git a/support/cbiit-deploy.sh b/support/cbiit-deploy.sh
@@ -150,9 +150,7 @@ docker compose --project-name edrn start portal" || exit 1
 echo ""
 echo "🆙 Applying upgrades"
 ssh -q $USER@$WEBSERVER "cd $WEBROOT ; \
-docker compose --project-name edrn exec portal /usr/bin/django-admin copy_daily_hits_from_wagtailsearch &&\
-docker compose --project-name edrn exec portal /usr/bin/django-admin edrn_data_disclaimer &&\
-docker compose --project-name edrn exec portal /usr/bin/django-admin edrn_new_explorers" || exit 1
+docker compose --project-name edrn exec portal /usr/bin/django-admin copy_daily_hits_from_wagtailsearch" || exit 1
 
 
 echo ""

diff --git a/support/devrebuild.sh b/support/devrebuild.sh
@@ -56,14 +56,14 @@ bzip2 --decompress --stdout edrn.sql.bz2 | psql --dbname=edrn --echo-errors --qu
 ./manage.sh migrate
 ./manage.sh copy_daily_hits_from_wagtailsearch  # Wagtail 5
 ./manage.sh collectstatic --no-input --clear --link
-./manage.sh edrn_data_disclaimer
-./manage.sh edrn_new_explorers
 ./manage.sh edrndevreset
 
 # Add additional upgrade steps here:
 #
 # Currently for 6.11 there is just this
 # ./manage.sh edrn_biomarker_submission
+# ./manage.sh edrn_data_disclaimer
+# ./manage.sh edrn_new_explorers
 # For 6.13 there's nothing yet
 
 # This may be optional if you want to save time: