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

2
integrations/docker/monitor_dockerfile
View File

@@ -1,4 +1,4 @@
# ZT Network Containers Test Monitor
# ZT SDK Test Monitor
FROM fedora:23
MAINTAINER https://www.zerotier.com/

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)

12
integrations/docker/sdk_dockerfile
View File

@@ -1,4 +1,4 @@
# ZT Network Containers Test
# ZT SDK Test
FROM fedora:23
MAINTAINER https://www.zerotier.com/
@@ -9,8 +9,8 @@ RUN yum clean all
# Add ZT files
RUN mkdir -p /var/lib/zerotier-one/networks.d
ADD netcon_identity.public /var/lib/zerotier-one/identity.public
ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
ADD sdk_identity.public /var/lib/zerotier-one/identity.public
ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
ADD *.conf /var/lib/zerotier-one/networks.d/
ADD *.conf /
ADD *.name /
@@ -29,8 +29,8 @@ ADD zerotier-cli /
Add zerotier-sdk-service /
# Install test scripts
ADD netcon_entrypoint.sh /netcon_entrypoint.sh
RUN chmod -v +x /netcon_entrypoint.sh
ADD sdk_entrypoint.sh /sdk_entrypoint.sh
RUN chmod -v +x /sdk_entrypoint.sh
# Start ZeroTier-One
CMD ["./netcon_entrypoint.sh"]
CMD ["./sdk_entrypoint.sh"]

2
integrations/docker/sdk_entrypoint.sh
View File

@@ -15,7 +15,7 @@ address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host an
# --- Network Config ---
echo '*** ZeroTier Network Containers Test: ' "$test_name"
echo '*** ZeroTier SDK Test: ' "$test_name"
chown -R daemon /var/lib/zerotier-one
chgrp -R daemon /var/lib/zerotier-one
su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1'