# HG changeset patch # User smith@nwoca.org # Date 1542057151 0 # Node ID b72855a930f11c156408d6ab41bc60ad7d21f960 # Parent 74ba1fec18f3681a6587d4f90c73d4ea7a6107e6 simplify method of getting project name diff -r 74ba1fec18f3 -r b72855a930f1 scripts/.functions.sh --- a/scripts/.functions.sh Thu Jul 26 14:27:43 2018 +0100 +++ b/scripts/.functions.sh Mon Nov 12 21:12:31 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 }