Skip to content

Commit

Permalink
WIP #283
Browse files Browse the repository at this point in the history
  • Loading branch information
nutjob4life committed Aug 30, 2023
1 parent b778f2a commit 1ffc67d
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/edrnsite.policy/src/edrnsite/policy/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.4.0
6.5.0
34 changes: 18 additions & 16 deletions support/cbiit-deploy-prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,22 +134,24 @@ docker compose --project-name edrn stop search &&\
sleep 60 &&\
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 django-admin edrn_explorer &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed &&
docker compose --project-name edrn exec portal django-admin edrn_forms" || exit 1
# There are on upgrade steps at this time

# echo ""
# echo "🆙 Applying upgrades"
# ssh -q $USER@$WEBSERVER "cd $WEBROOT ; \
# docker compose --project-name edrn exec portal django-admin edrn_explorer &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed &&
# docker compose --project-name edrn exec portal django-admin edrn_forms" || exit 1

# ↑ We might need to repeat that edrn_pubmed step several times if memory is an issue

Expand Down
34 changes: 18 additions & 16 deletions support/cbiit-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,22 +139,24 @@ docker compose --project-name edrn stop search &&\
sleep 60 &&\
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 django-admin edrn_explorer &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
docker compose --project-name edrn exec portal django-admin edrn_pubmed &&
docker compose --project-name edrn exec portal django-admin edrn_forms" || exit 1
# There are no upgrade steps at this time

# echo ""
# echo "🆙 Applying upgrades"
# ssh -q $USER@$WEBSERVER "cd $WEBROOT ; \
# docker compose --project-name edrn exec portal django-admin edrn_explorer &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed || true &&
# docker compose --project-name edrn exec portal django-admin edrn_pubmed &&
# docker compose --project-name edrn exec portal django-admin edrn_forms" || exit 1

# ↑ We might need to repeat that edrn_pubmed step several times if memory is an issue

Expand Down
6 changes: 3 additions & 3 deletions support/devrebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ bzip2 --decompress --stdout edrn.sql.bz2 | psql --dbname=edrn --echo-errors --qu
./manage.sh edrndevreset

# Add additional upgrade steps here:
./manage.sh edrn_explorer
./manage.sh edrn_pubmed
./manage.sh edrn_forms
# ./manage.sh edrn_explorer
# ./manage.sh edrn_pubmed
# ./manage.sh edrn_forms

# This may be optional if you want to save time:
./manage.sh rdfingest
Expand Down

0 comments on commit 1ffc67d

Please sign in to comment.