Support of #373

EDRN · Sep 27, 2024 · 2bbd01e · 2bbd01e
1 parent ec3331e
commit 2bbd01e
Show file tree

Hide file tree

Showing 4 changed files with 10 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.15.0
+6.16.0
diff --git a/support/cbiit-deploy-prod.sh b/support/cbiit-deploy-prod.sh
@@ -77,15 +77,15 @@ docker compose --project-name edrn down --remove-orphans &&\
 docker compose rm --force --stop --volumes &&\
 docker container ls" || exit 1
 
-# echo ""
-# echo "🪢 Pulling the images anonymously"
-# ssh -q $USER@$WEBSERVER "cd $WEBROOT ; \
-# docker logout ncidockerhub.nci.nih.gov && docker logout &&\
-# docker image rm --force edrndocker/edrn-portal:$EDRN_VERSION &"
+echo ""
+echo "🪢 Pulling the images anonymously"
+ssh -q $USER@$WEBSERVER "cd $WEBROOT ; \
+docker logout ncidockerhub.nci.nih.gov && docker logout &&\
+docker image rm --force edrndocker/edrn-portal:$EDRN_VERSION &"
 
 # The `docker image rm` step can take a long time, and sshd will time out the
 # idle connection because it's a despotic and horrible server.
-# sleep 400
+sleep 600
 
 # ssh -q $USER@$WEBSERVER "cd $WEBROOT ; \
 # docker compose --project-name edrn pull --include-deps --quiet" || exit 1

diff --git a/support/cbiit-deploy.sh b/support/cbiit-deploy.sh
@@ -90,7 +90,7 @@ docker image rm --force edrndocker/edrn-portal:$EDRN_VERSION &"
 
 # The `docker image rm` step can take a long time, and sshd will time out the
 # idle connection because it's a despotic and horrible server.
-sleep 400
+sleep 600
 
 ssh -q $USER@$WEBSERVER "cd $WEBROOT ; \
 docker compose --project-name edrn pull --include-deps --quiet" || exit 1

diff --git a/support/devrebuild.sh b/support/devrebuild.sh
@@ -6,7 +6,7 @@
 # Download the latest production database, apply migrations, and get ready to rock and roll.
 
 
-jpl_sys_ipv4=172.16.16.3
+jpl_sys_ipv4=172.16.16.10
 
 
 # Argument check
@@ -48,6 +48,7 @@ createdb "edrn" 'P5 for the Early Detection Research Network'
 # Must use --checksum here because the nightly refresh from NCI to tumor munges all the timestamps
 # rsync --checksum --no-motd --recursive --delete --progress tumor.jpl.nasa.gov:/usr/local/edrn/portal/ops-nci/media .
 rsync --checksum --no-motd --recursive --delete --progress $jpl_sys_ipv4:/Users/kelly/P6/media .
+touch media/.nobackup
 scp $jpl_sys_ipv4:/Users/kelly/P6/edrn.sql.bz2 .
 bzip2 --decompress --stdout edrn.sql.bz2 | psql --dbname=edrn --echo-errors --quiet