gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed old Network Containers reference

Browse Source
This commit is contained in:
Joseph Henry
2016-07-06 17:16:12 -05:00
parent f9fcc89f62
commit c2f009ce78
60 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integrations/docker/monitor_entrypoint.sh
View File

@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
test_name="${test_namefile%.*}" # test network id
nwconf=$(ls *.conf) # blank test network config file
nwid="${nwconf%.*}" # test network id
netcon_wait_time=25 # wait for test container to come online
sdk_wait_time=25 # wait for test container to come online
app_timeout_time=15 # app-specific timeout
file_path=/opt/results/ # test result output file path (fs shared between host and containers)
file_base="$test_name".txt # test result output file
@@ -19,7 +19,7 @@ address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host an
# --- Network Config ---
echo '*** ZeroTier Network Containers Test Monitor'
echo '*** ZeroTier SDK Test Monitor'
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'
@@ -30,8 +30,8 @@ while [ -z "$virtip4" ]; do
done
echo '*** Starting Test...'
echo '*** Up and running at' $virtip4 ' on network: ' $nwid
echo '*** Sleeping for (' "$netcon_wait_time" 's ) while we wait for the Network Container to come online...'
sleep "$netcon_wait_time"s
echo '*** Sleeping for (' "$sdk_wait_time" 's ) while we wait for the Network Container to come online...'
sleep "$sdk_wait_time"s
ncvirtip=$(<$address_file)