Mercurial > public > ssdt-docker
changeset 181:5c4e8cc8d75d
flow: Promoted <hotfix> 'v1.2.2' (ae2b4a5294ff) to 'default'.
| author | smith@nwoca.org |
|---|---|
| date | Mon, 11 Sep 2017 22:01:37 +0100 |
| parents | f18dcd16595a (current diff) ae2b4a5294ff (diff) |
| children | 21eebe9c1a8c |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Sep 05 20:55:32 2017 +0100 +++ b/.hgtags Mon Sep 11 22:01:37 2017 +0100 @@ -2,3 +2,4 @@ 60bb94387b7dfc56227da60f4b530c4e30a4a985 v1.1.0 73c0c04a44eb08462f9f94f4256fdf905f339f85 v1.1.1 daf91a3bbee56ebe7d293a72c9e8732ac1bce724 v1.2.0 +577d9750fe01f3fad68bffd1908612abe87d794d v1.2.1
--- a/scripts/console.sh Tue Sep 05 20:55:32 2017 +0100 +++ b/scripts/console.sh Mon Sep 11 22:01: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 +