Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge

doc/ext/kubernetes/.zerotierCliSettings

@@ -5,7 +5,7 @@
   "defaultOne": "@local",
   "things": {
     "local": {
-      "auth": "XXXXXXXXXXXXXXXXXXXXXXXX",
+      "auth": "local_service_auth_token_replaced_automatically",
       "type": "one",
       "url": "http://127.0.0.1:9993/"
     },

doc/ext/kubernetes/Dockerfile

@@ -4,7 +4,8 @@ EXPOSE 8080/tcp 9993/udp
 # Install ZT network conf files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD *.conf /var/lib/zerotier-one/networks.d/
-ADD zerotier /
+ADD *.conf /
+ADD zerotier-one /
 ADD zerotier-cli /
 ADD .zerotierCliSettings /
 

doc/ext/kubernetes/entrypoint.sh

@@ -1,23 +1,21 @@
+#!/bin/bash
+
 echo '*** ZeroTier-Kubernetes self-auth test script'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-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/^<dev>//" | tr '\n' '\0'`
-done
-echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+dev=""
 
-echo '*** Self-Authorizing to deployment network'
 nwconf=$(ls *.conf)
 nwid="${nwconf%.*}"
 
-AUTHTOKEN=$(cat /var/lib/zerotier-one/authtoken.secret)
-sed "s|\local_service_auth_token|${AUTHTOKEN}|" .zerotierCliSettings > /root/.zerotierCliSettings
-
-./zerotier-cli join $(nwid).conf
-./zerotier-cli net-auth $(nwid) $(dev)
+sleep 10
+dev=$(cat /var/lib/zerotier-one/identity.public| cut -d ':' -f 1)
 
-# node server.js
+echo '*** Joining'
+./zerotier-cli join "$nwid".conf
+AUTHTOKEN=$(cat /var/lib/zerotier-one/authtoken.secret)
+sed "s|\local_service_auth_token_replaced_automatically|${AUTHTOKEN}|" .zerotierCliSettings > /root/.zerotierCliSettings
+echo '*** Authorizing'
+./zerotier-cli net-auth @my.zerotier.com "$nwid" "$dev"
+node server.js