diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-06 11:38:11 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-01-06 11:38:11 -0800 |
| commit | ff9317365a1d9498076b0971f0209fc2aec5c142 (patch) | |
| tree | 108e2022662732946807a55fa61c4896780e590a /tests/http/docker-main.sh | |
| parent | b8059d5c879ef02865198634679a7c04fda44949 (diff) | |
| parent | 0a3ef38cade03c9b6a4f94611bd3df620ce1f4e6 (diff) | |
| download | infinitytier-ff9317365a1d9498076b0971f0209fc2aec5c142.tar.gz infinitytier-ff9317365a1d9498076b0971f0209fc2aec5c142.zip | |
Merge branch 'dev' into edge
Diffstat (limited to 'tests/http/docker-main.sh')
| -rwxr-xr-x | tests/http/docker-main.sh | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tests/http/docker-main.sh b/tests/http/docker-main.sh deleted file mode 100755 index 29cdced9..00000000 --- a/tests/http/docker-main.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin - -/zerotier-one -d >>zerotier-one.out 2>&1 - -# Wait for ZeroTier to start and join the network -while [ ! -d "/proc/sys/net/ipv6/conf/zt0" ]; do - sleep 0.25 -done - -# Wait just a bit longer for stuff to settle -sleep 5 - -exec node --harmony /agent.js >>agent.out 2>&1 -#exec node --harmony /agent.js |
