diff scripts/console.sh @ 179:ae2b4a5294ff hotfix/v1.2.2

DEP-12: fix console script for containers in multiple networks
author smith@nwoca.org
date Mon, 11 Sep 2017 22:00:37 +0100
parents 8f45c43ea7a4
children 9afc8cb478f6
line wrap: on
line diff
--- a/scripts/console.sh	Mon Sep 11 21:57:24 2017 +0100
+++ b/scripts/console.sh	Mon Sep 11 22:00:37 2017 +0100
@@ -3,7 +3,7 @@
 # For docker 1.12 and compose 1.9 (and higher) assume project is assigned to a network 
 #  named "${project}_default" per SSDT templates.
 
-source "$( dirname "${BASH_SOURCE[0]}")/.functions.sh"
+source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"
 
 container=$(composeGetContainer ${1?"Must specify the app service of the console to connect to"} )
 
@@ -11,13 +11,15 @@
 
 if [ "$ip" == "" ]
 then
-   ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $container)
    project=$(composeGetProject ${1} )
+   ip=$(docker inspect -f "{{with  .NetworkSettings.Networks}}{{.${project}_default.IPAddress}}{{end}}" $container)
 fi
 
 if [ "$project" == "" ]
 then 
   docker run -it -v ${PWD}:/tmp  -v ${SSDT_HOME}:/ssdt --rm docker.ssdt.io/ssdt-utils telnet $ip 2000 | tee console.log
 else
+  echo "connecting to telnet console on ${container} in ${project}"
   docker run -it --network ${project}_default --rm docker.ssdt.io/ssdt-utils telnet $ip 2000 | tee console.log
 fi
+