diff options
| author | Joseph Henry <josephjah@gmail.com> | 2016-08-17 18:33:49 -0700 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2016-08-17 18:33:49 -0700 |
| commit | 3e261fb999895d32e1253098d7f28933f50782a4 (patch) | |
| tree | a0c72b0953ea76834fd007dd74ba7427a8da7395 /doc | |
| parent | 0fd3afe2c8bfc2f12af0e1e546f36d03c6f0b2a6 (diff) | |
| download | infinitytier-3e261fb999895d32e1253098d7f28933f50782a4.tar.gz infinitytier-3e261fb999895d32e1253098d7f28933f50782a4.zip | |
updated entrypoint
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ext/kubernetes/Dockerfile | 2 | ||||
| -rw-r--r-- | doc/ext/kubernetes/entrypoint.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/ext/kubernetes/Dockerfile b/doc/ext/kubernetes/Dockerfile index c33b6bab..74af6c1a 100644 --- a/doc/ext/kubernetes/Dockerfile +++ b/doc/ext/kubernetes/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /var/lib/zerotier-one/networks.d ADD *.conf /var/lib/zerotier-one/networks.d/ ADD zerotier / ADD zerotier-cli / -ADD .zerotierCliSettings /root/ +ADD .zerotierCliSettings / # Install App ADD server.js / diff --git a/doc/ext/kubernetes/entrypoint.sh b/doc/ext/kubernetes/entrypoint.sh index 8ec7312a..881d92cf 100644 --- a/doc/ext/kubernetes/entrypoint.sh +++ b/doc/ext/kubernetes/entrypoint.sh @@ -13,9 +13,9 @@ echo '*** Up and running at' $virtip4 ' on network: ' $nwid echo '*** Self-Authorizing to deployment network' nwconf=$(ls *.conf) nwid="${nwconf%.*}" -AUTHTOKEN="(cat /var/lib/zerotier-one/authtoken.secret)" -grep -rl 'local_service_auth_token' ./ | xargs sed -i 's/local_service_auth_token/' $AUTHTOKEN '/g' +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) |