# HG changeset patch
# User smith@nwoca.org
# Date 1507581335 -3600
# Node ID 6210629ba54fa42e34352e2112b5bd93098ef4ea
# Parent  fe6e83ff2d124267e0780de096725e0e8e686af6# Parent  0add40f5c5b79e4c5bdf5f9e6445258122723d5a
flow: Merged <release> 'v1.7.0' to <master> ('production').

diff -r fe6e83ff2d12 -r 6210629ba54f scripts/restore-container.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/restore-container.sh	Mon Oct 09 21:35:35 2017 +0100
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"
+
+sourceFile=${1?must provide backup file to be restored}
+
+if [ -z "$1" ]
+then
+  echo "Usage: `basename $0` {backup file to restore}"
+  echo " must specify the name of the file to restore.  Assumed to be in format:"
+  echo "     {service}.{timestamp}.backup.gz  "
+  echo "       where {service} is the usasdb or uspsdb container to be restored."
+  echo " The script will restore the backup to the appropriate container based "
+  echo " on the filename."
+  exit $E_NOARGS
+fi
+
+target=$(basename $1)
+target=${target%%.*}
+
+project=$(composeGetProject $target)
+
+if [ "$project" == "" ]; then
+   echo "no project available"
+   exit 1
+fi
+
+echo 
+echo "Preparing to restore"
+echo "--------------------"
+echo "   file: $sourceFile"
+echo "   to    ${project}/${target} database: $target"
+echo " "
+echo "WARNING:  This operation will DELETE and replace any exising database"
+echo " "
+
+read -e -p "Continue? <y/N> " answer
+case $answer in
+     y | Y | yes | YES ) answer="y";;
+     n | N | no | NO ) answer="n";;
+     *) answer="n"
+esac
+
+if [ "$answer" == "y" ] 
+then
+  appService=${target/db/app}
+  echo "stopping application service $appService"
+  docker-compose stop $appService
+
+  dbContainer=$(composeGetContainer $target)
+ 
+  echo "copy backup file to database container"
+  docker cp ${sourceFile} ${dbContainer}:/tmp/restore.backup.gz
+
+  echo "starting database restore"
+  docker-compose exec -T -u postgres $target sh -c "gunzip -f /tmp/restore.backup.gz -c | psql"
+
+fi
+
diff -r fe6e83ff2d12 -r 6210629ba54f scripts/restore-usas.sh
--- a/scripts/restore-usas.sh	Mon Oct 09 17:23:09 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ -z "$1" ]
-then
-  echo "Usage: `basename $0` {backup file to restore}"
-  echo  " filename must relative to the container's file system. (e.g. /backup/filename)"
-  exit $E_NOARGS
-fi
-
-source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"
-
-docker-compose stop usasapp
-docker-compose restart usasdb
-docker-compose run --rm usasdb sh -c \
-   "gunzip -f $1 -c | psql --host=usasdb --username=postgres"
-docker-compose start usasapp
diff -r fe6e83ff2d12 -r 6210629ba54f scripts/restore-usps.sh
--- a/scripts/restore-usps.sh	Mon Oct 09 17:23:09 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#!/bin/bash
-if [ -z "$1" ]
-then
-  echo "Usage: `basename $0` {backup file to restore}"
-  echo  " filename must relative to the container's file system. (e.g. /backup/filename)"
-  exit $E_NOARGS
-fi
-source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"
-
-docker-compose stop uspsapp
-docker-compose restart uspsdb
-docker-compose run --rm uspsdb sh -c \
-   "gunzip -f $1 -c | psql --host=uspsdb --username=postgres"
-docker-compose start uspsapp
-