Removed old Network Containers reference

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
+8 -8
View File
@@ -9,7 +9,7 @@ This short tutorial will show you how to enable ZeroTier functionality for your
**Step 1: Build the ZeroTier service binaries**
From the ZeroTier source directory, `make netcon` Optionally, if you'd like to see some debug output during execution, use `make sdk SDK_DEBUG=1`
From the ZeroTier source directory, `make sdk` Optionally, if you'd like to see some debug output during execution, use `make sdk SDK_DEBUG=1`
**Step 2: Build your Docker image**
@@ -28,8 +28,8 @@ RUN yum -y install redis-3.0.4-1.fc23.x86_64
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 /
@@ -41,12 +41,12 @@ ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libztintercept
ADD zerotier-cli /
Add zerotier-netcon-service /
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"]
```
**Step 3: Start your container**
@@ -57,7 +57,7 @@ CMD ["./netcon_entrypoint.sh"]
Set our application pre-load with `export LD_PRELOAD=./libztintercept.so`. This dynamically loads our intercept library into your application which allows us to re-direct its network calls to our virtual network.
Tell the ZeroTier Network Containers service which network to connect to with `export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_XXXXXXXXXXXXXXXX`.
Tell the ZeroTier SDK service which network to connect to with `export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_XXXXXXXXXXXXXXXX`.
**Step 5: Run your new ZeroTier-enabled service**
+1 -1
View File
@@ -1,4 +1,4 @@
# ZT Network Containers Test Monitor
# ZT SDK Test Monitor
FROM fedora:23
MAINTAINER https://www.zerotier.com/
+4 -4
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)
+6 -6
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"]
+1 -1
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'
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash
# Builds Zerotier-One and libraries required for Network Containers, then
# Builds Zerotier-One and libraries required for SDK, then
# copies the binaries into the test directory.
cd ../../
@@ -1,4 +1,4 @@
# ZT Network Containers Test Monitor
# ZT SDK Test Monitor
FROM fedora:23
MAINTAINER https://www.zerotier.com/
@@ -22,7 +22,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
# --- 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'
@@ -1,4 +1,4 @@
# ZT Network Containers Test
# ZT SDK Test
FROM fedora:23
MAINTAINER https://www.zerotier.com/
@@ -17,7 +17,7 @@ bigfile_size=10M # size of file we want to use for the test
tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
# --- 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'
@@ -1,4 +1,4 @@
# ZT Network Containers Test Monitor
# ZT SDK Test Monitor
FROM fedora:23
MAINTAINER https://www.zerotier.com/
@@ -22,7 +22,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
# --- 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'
@@ -1,4 +1,4 @@
# ZT Network Containers Test
# ZT SDK Test
FROM fedora:23
MAINTAINER https://www.zerotier.com/
@@ -17,7 +17,7 @@ bigfile_size=10M # size of file we want to use for the test
tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
# --- 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'
@@ -1,4 +1,4 @@
# ZT Network Containers Test Monitor
# ZT SDK Test Monitor
FROM fedora:23
MAINTAINER https://www.zerotier.com/
@@ -22,7 +22,7 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
# --- 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'
@@ -1,4 +1,4 @@
# ZT Network Containers Test
# ZT SDK Test
FROM ubuntu:14.04
MAINTAINER https://www.zerotier.com/
@@ -17,7 +17,7 @@ bigfile_size=10M # size of file we want to use for the test
tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
# --- 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'
@@ -1,4 +1,4 @@
# ZT Network Containers Test Monitor
# ZT SDK Test Monitor
FROM fedora:23
MAINTAINER https://www.zerotier.com/

Some files were not shown because too many files have changed in this diff Show More