# HG changeset patch # User smith@nwoca.org # Date 1542311282 0 # Node ID d6d8468441b1d021797fcb021cb641e25a479827 # Parent 1fce27dcc3590ba2922393ce8a861517a95429a3 use container id's and inspect to derive projet and container names diff -r 1fce27dcc359 -r d6d8468441b1 scripts/.functions.sh --- a/scripts/.functions.sh Wed Nov 14 22:05:33 2018 +0000 +++ b/scripts/.functions.sh Thu Nov 15 19:48:02 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 }