# HG changeset patch
# User smith@nwoca.org
# Date 1542057855 0
# Node ID 0032d099a2d5033819cbe463e59956317c3e36ca
# Parent  17894e17b6fd73bf8f096a2eeca616a522b4ebbb# Parent  db32d5c0a22fdec480c85372d9c7f3de6faaae47
flow: Merged <release> 'v2.2.0' to <master> ('production').

diff -r 17894e17b6fd -r 0032d099a2d5 scripts/.functions.sh
--- a/scripts/.functions.sh	Thu Jul 26 14:27:43 2018 +0100
+++ b/scripts/.functions.sh	Mon Nov 12 21:24:15 2018 +0000
@@ -34,7 +34,6 @@
 # finds docker container for specified compose service 
 composeGetContainer() {
   service=${1?"Must supply service from current project"}
-
   container=$( docker-compose ps | cut -d " " -f 1 -s | grep _${service}_ )
   echo $container
 }
@@ -47,7 +46,6 @@
 }
 
 composeGetProject() {  
-  service=${1?"Must supply service from current project"}
-  container=$(composeGetContainer $service)
-  echo $(docker inspect -f '{{index .Config.Labels "com.docker.compose.project" }}' $container)
+  project=$( docker-compose ps | tail -n1 | cut -d "_" -f 1 -s )
+  echo $project
 }
diff -r 17894e17b6fd -r 0032d099a2d5 scripts/backup-container.sh
--- a/scripts/backup-container.sh	Thu Jul 26 14:27:43 2018 +0100
+++ b/scripts/backup-container.sh	Mon Nov 12 21:24:15 2018 +0000
@@ -19,7 +19,7 @@
 mkdir -p ./backup
 backupFile=./backup/${container}.$(date +%Y-%m-%d-%H-%M-%S).backup
 
-project=$(composeGetProject $container)
+project=$(composeGetProject)
 
 if [ "$project" == "" ]; then
    echo "no project available"
@@ -31,7 +31,7 @@
 
 if [[ $( grep --count "CREATE TABLE" ${backupFile} ) -lt 200 || $( grep --count "PostgreSQL database dump complete" ${backupFile} ) -eq 0 ]]; then
    echo "ERROR: backup verification FAILED"
-   echo "ERROR:  $(tail ${backupFile})"
+   echo "ERROR: $(tail ${backupFile})"
    exit 1
 fi