From 2196d982c374231e09f41d23cc32932391036ee8 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Thu, 3 Dec 2015 18:50:20 -0800 Subject: (fixed) nwid detection in test script --- netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'netcon/docker-test/nodejs') diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh index a6aadb9f..a6e1b6c1 100644 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh +++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh @@ -23,11 +23,13 @@ virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` + dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^//" | tr '\n' '\0'` done echo '*** Up and running at' $virtip4 ' on network: ' $nwid echo '*** Writing address to ' "$address_file" echo $virtip4 > "$address_file" +export ZT_NC_NWID=$dev # --- Test section --- echo '*** Starting application...' -- cgit v1.2.3