# HG changeset patch
# User smith@nwoca.org
# Date 1542312648 0
# Node ID d41836720ce4ded3d3bd099241d10cc4dd57a173
# Parent  5599ce0c5a5032b216675156e80f915fcb3908a8# Parent  506a21d8c89a31640ecdd9e63f5c71981cfdbb99
flow: Merged <release> 'v2.3.0' to <master> ('production').

diff -r 5599ce0c5a50 -r d41836720ce4 scripts/.functions.sh
--- a/scripts/.functions.sh	Wed Nov 14 22:05:33 2018 +0000
+++ b/scripts/.functions.sh	Thu Nov 15 20:10:48 2018 +0000
@@ -34,7 +34,7 @@
 # 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}_ )
+  container=$( docker-compose ps -q $service | xargs docker inspect -f '{{.Name}}' | cut -d "/" -f 2 )
   echo $container
 }
 
@@ -46,6 +46,6 @@
 }
 
 composeGetProject() {  
-  project=$( docker-compose ps | tail -n1 | cut -d "_" -f 1 -s )
+  project=$(docker-compose ps -q | tail -n1 |  xargs docker inspect -f "{{ index .Config.Labels \"com.docker.compose.project\"}}" )
   echo $project
 }
diff -r 5599ce0c5a50 -r d41836720ce4 scripts/backup-container.sh
--- a/scripts/backup-container.sh	Wed Nov 14 22:05:33 2018 +0000
+++ b/scripts/backup-container.sh	Thu Nov 15 20:10:48 2018 +0000
@@ -20,7 +20,6 @@
 backupFile=./backup/${container}.$(date +%Y-%m-%d-%H-%M-%S).backup
 
 echo "preparing to backup ${container} on current project at ${projectDir}:"
-docker-compose ps
 echo " "
 
 project=$(composeGetProject)