From c2f009ce78c93cacfd623aba54a3891a542690bd Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Wed, 6 Jul 2016 17:16:12 -0500 Subject: [PATCH] Removed old Network Containers reference --- integrations/Docker/README.md | 16 ++++++++-------- .../UserInterfaceState.xcuserstate | Bin 42939 -> 42939 bytes integrations/docker/monitor_dockerfile | 2 +- integrations/docker/monitor_entrypoint.sh | 8 ++++---- integrations/docker/sdk_dockerfile | 12 ++++++------ integrations/docker/sdk_entrypoint.sh | 2 +- tests/docker/build_zt.sh | 2 +- .../darkhttpd-1.11.x86_64/monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../darkhttpd-1.11.x86_64/sdk_dockerfile | 2 +- .../darkhttpd-1.11.x86_64/sdk_entrypoint.sh | 2 +- .../monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../httpd-2.4.16-1.fc23.x86_64/sdk_dockerfile | 2 +- .../sdk_entrypoint.sh | 2 +- .../monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../httpd-2.4.16-1.ub14.x86_64/sdk_dockerfile | 2 +- .../sdk_entrypoint.sh | 2 +- .../monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../httpd-2.4.18-1.fc23.x86_64/sdk_dockerfile | 2 +- .../sdk_entrypoint.sh | 2 +- .../docker/httpd/httpd_demo/htdocs/index.html | 12 ++++++------ .../httpd/httpd_demo/monitor_dockerfile | 2 +- .../httpd/httpd_demo/monitor_entrypoint.sh | 2 +- tests/docker/httpd/httpd_demo/sdk_dockerfile | 2 +- .../docker/httpd/httpd_demo/sdk_entrypoint.sh | 2 +- .../monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile | 2 +- .../sdk_entrypoint.sh | 2 +- .../monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile | 2 +- .../sdk_entrypoint.sh | 2 +- .../monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile | 2 +- .../sdk_entrypoint.sh | 2 +- .../nodejs-0.10.36-4.fc23/monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../nodejs-0.10.36-4.fc23/sdk_dockerfile | 2 +- .../nodejs-0.10.36-4.fc23/sdk_entrypoint.sh | 2 +- tests/docker/python/python/monitor_dockerfile | 2 +- .../python/python/monitor_entrypoint.sh | 2 +- tests/docker/python/python/sdk_dockerfile | 2 +- tests/docker/python/python/sdk_entrypoint.sh | 2 +- .../docker/python/python3/monitor_dockerfile | 2 +- .../python/python3/monitor_entrypoint.sh | 2 +- tests/docker/python/python3/sdk_dockerfile | 2 +- tests/docker/python/python3/sdk_entrypoint.sh | 2 +- .../monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../redis-3.0.4-1.fc23.x86_64/sdk_dockerfile | 2 +- .../sdk_entrypoint.sh | 2 +- .../monitor_dockerfile | 2 +- .../monitor_entrypoint.sh | 2 +- .../sdk_dockerfile | 2 +- .../sdk_entrypoint.sh | 2 +- 60 files changed, 79 insertions(+), 79 deletions(-) diff --git a/integrations/Docker/README.md b/integrations/Docker/README.md index 841a95a..152cf3d 100644 --- a/integrations/Docker/README.md +++ b/integrations/Docker/README.md @@ -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** diff --git a/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/example_app/Example_OSX_App.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index 0956fbedf52538815712b620c02b82c5c2b45568..f1ba41c224ef17a3876d6721cd1c214b691d8a52 100644 GIT binary patch delta 49 zcmdmeo@w`arVaO{#JBC8`sYwgwXubnv5tbFsj+2kWVMN@+2(Iji>/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) diff --git a/integrations/docker/sdk_dockerfile b/integrations/docker/sdk_dockerfile index 51642f9..f22b545 100644 --- a/integrations/docker/sdk_dockerfile +++ b/integrations/docker/sdk_dockerfile @@ -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"] diff --git a/integrations/docker/sdk_entrypoint.sh b/integrations/docker/sdk_entrypoint.sh index 7665f5c..0d04e2f 100644 --- a/integrations/docker/sdk_entrypoint.sh +++ b/integrations/docker/sdk_entrypoint.sh @@ -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' diff --git a/tests/docker/build_zt.sh b/tests/docker/build_zt.sh index 6534ca2..e461e65 100755 --- a/tests/docker/build_zt.sh +++ b/tests/docker/build_zt.sh @@ -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 ../../ diff --git a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_dockerfile b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_dockerfile +++ b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh index b57a317..3e94118 100644 --- a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh +++ b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_dockerfile b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_dockerfile index 3691246..02a792f 100644 --- a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_dockerfile +++ b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_entrypoint.sh b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_entrypoint.sh index 833388d..ef94b8f 100644 --- a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_entrypoint.sh +++ b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_entrypoint.sh @@ -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' diff --git a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile +++ b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh index b57a317..3e94118 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh +++ b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_dockerfile b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_dockerfile index 47c12f3..c374ea7 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_dockerfile +++ b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_entrypoint.sh index 5633dae..434324d 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_entrypoint.sh +++ b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_entrypoint.sh @@ -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' diff --git a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_dockerfile b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_dockerfile +++ b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh index b57a317..3e94118 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh +++ b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_dockerfile b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_dockerfile index 6dcb8b7..f4fdaa3 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_dockerfile +++ b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM ubuntu:14.04 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_entrypoint.sh index 5633dae..434324d 100644 --- a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_entrypoint.sh +++ b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_entrypoint.sh @@ -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' diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile +++ b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh index b57a317..3e94118 100644 --- a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh +++ b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_dockerfile b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_dockerfile index b240910..a9076f3 100644 --- a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_dockerfile +++ b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_entrypoint.sh b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_entrypoint.sh index 6b92bfd..7ba4e93 100644 --- a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_entrypoint.sh +++ b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_entrypoint.sh @@ -18,7 +18,7 @@ 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' diff --git a/tests/docker/httpd/httpd_demo/htdocs/index.html b/tests/docker/httpd/httpd_demo/htdocs/index.html index 017e449..5e57aa0 100644 --- a/tests/docker/httpd/httpd_demo/htdocs/index.html +++ b/tests/docker/httpd/httpd_demo/htdocs/index.html @@ -5,7 +5,7 @@ - ZeroTier Network Containers Preview + ZeroTier SDK Preview @@ -15,7 +15,7 @@
-

ZeroTier Network Containers Preview

+

ZeroTier SDK Preview

(a.k.a. super bleeding edge pre-alphe pre-release demo)
@@ -46,19 +46,19 @@ It's a bit like how networking would work on a microkernel: modular, composable,

-Network Containers allows a Docker (or LXC, CoreOS/rkt, runc, OpenVZ, SmartOS/Triton, bocker, or even just bare metal Linux) system to connect to virtual networks without requiring any special permissions or special configuration on the host node. Processes inside the container don't even need to run with root permissions. It's 100% user-space, making it ideal for multi-tenant deployments or any other situation where modifying the configuration of the host node is impossible or just inconvenient. +SDK allows a Docker (or LXC, CoreOS/rkt, runc, OpenVZ, SmartOS/Triton, bocker, or even just bare metal Linux) system to connect to virtual networks without requiring any special permissions or special configuration on the host node. Processes inside the container don't even need to run with root permissions. It's 100% user-space, making it ideal for multi-tenant deployments or any other situation where modifying the configuration of the host node is impossible or just inconvenient.

-Once properly tuned and optimized, Network Containers also has the potential to be much faster than tun/tap or pcap based network overlays. It imposes only a single context switch from application/service to virtual network microservice as opposed to at least four for tun/tap and pcap-based solutions, since the latter require two trips through the kernel network stack. We believe it may be possible to approach or even equal the performance of VXLAN/IPSec or other fully kernel-mode configurations, but with the ease and total independence of a fully container-based solution. +Once properly tuned and optimized, SDK also has the potential to be much faster than tun/tap or pcap based network overlays. It imposes only a single context switch from application/service to virtual network microservice as opposed to at least four for tun/tap and pcap-based solutions, since the latter require two trips through the kernel network stack. We believe it may be possible to approach or even equal the performance of VXLAN/IPSec or other fully kernel-mode configurations, but with the ease and total independence of a fully container-based solution.

-We created this container image to show you a preview of one of the projects we've been working on at ZeroTier. We still have a good deal of packaging, testing, and performance optimization work to do before Network Containers will be ready for a real public beta release. Follow the blog or @zerotier for updates and announcements. +We created this container image to show you a preview of one of the projects we've been working on at ZeroTier. We still have a good deal of packaging, testing, and performance optimization work to do before SDK will be ready for a real public beta release. Follow the blog or @zerotier for updates and announcements.

-P.S. If you want to use ZeroTier in Docker today, you can do it with the same ZeroTier One endpoint service you're using to access this network. The only catch is that you have to launch your containers with "--device=/dev/net/tun --cap-add=NET_ADMIN". Network Containers eliminates the need for these special options. +P.S. If you want to use ZeroTier in Docker today, you can do it with the same ZeroTier One endpoint service you're using to access this network. The only catch is that you have to launch your containers with "--device=/dev/net/tun --cap-add=NET_ADMIN". SDK eliminates the need for these special options.

diff --git a/tests/docker/httpd/httpd_demo/monitor_dockerfile b/tests/docker/httpd/httpd_demo/monitor_dockerfile index 08f08ae..587a85a 100644 --- a/tests/docker/httpd/httpd_demo/monitor_dockerfile +++ b/tests/docker/httpd/httpd_demo/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/httpd/httpd_demo/monitor_entrypoint.sh b/tests/docker/httpd/httpd_demo/monitor_entrypoint.sh index 965fadb..017abbc 100644 --- a/tests/docker/httpd/httpd_demo/monitor_entrypoint.sh +++ b/tests/docker/httpd/httpd_demo/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/httpd/httpd_demo/sdk_dockerfile b/tests/docker/httpd/httpd_demo/sdk_dockerfile index 53b63d5..0236004 100644 --- a/tests/docker/httpd/httpd_demo/sdk_dockerfile +++ b/tests/docker/httpd/httpd_demo/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/httpd/httpd_demo/sdk_entrypoint.sh b/tests/docker/httpd/httpd_demo/sdk_entrypoint.sh index 5c42b6a..75a68f4 100644 --- a/tests/docker/httpd/httpd_demo/sdk_entrypoint.sh +++ b/tests/docker/httpd/httpd_demo/sdk_entrypoint.sh @@ -18,7 +18,7 @@ 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-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' diff --git a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile +++ b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh index b57a317..3e94118 100644 --- a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh +++ b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile index be5b90c..9da1af9 100644 --- a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile +++ b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM ubuntu:14.04 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_entrypoint.sh b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_entrypoint.sh index fd21223..d9c7fb4 100644 --- a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_entrypoint.sh +++ b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_entrypoint.sh @@ -18,7 +18,7 @@ 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' diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile +++ b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh index b57a317..3e94118 100644 --- a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh +++ b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile index c26bb85..deca67c 100644 --- a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile +++ b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_entrypoint.sh index fd21223..d9c7fb4 100644 --- a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_entrypoint.sh +++ b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_entrypoint.sh @@ -18,7 +18,7 @@ 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' diff --git a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile +++ b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh index b57a317..3e94118 100644 --- a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh +++ b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile index 612d801..4575b83 100644 --- a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile +++ b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_entrypoint.sh index fd21223..d9c7fb4 100644 --- a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_entrypoint.sh +++ b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_entrypoint.sh @@ -18,7 +18,7 @@ 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' diff --git a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile +++ b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh index 2ac1381..4dc1931 100644 --- a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh +++ b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_dockerfile b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_dockerfile index 56c7518..335369b 100644 --- a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_dockerfile +++ b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_entrypoint.sh b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_entrypoint.sh index 4d2283d..0a0d206 100644 --- a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_entrypoint.sh +++ b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_entrypoint.sh @@ -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' diff --git a/tests/docker/python/python/monitor_dockerfile b/tests/docker/python/python/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/python/python/monitor_dockerfile +++ b/tests/docker/python/python/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/python/python/monitor_entrypoint.sh b/tests/docker/python/python/monitor_entrypoint.sh index b57a317..3e94118 100644 --- a/tests/docker/python/python/monitor_entrypoint.sh +++ b/tests/docker/python/python/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/python/python/sdk_dockerfile b/tests/docker/python/python/sdk_dockerfile index 2f93fd9..9680e4f 100644 --- a/tests/docker/python/python/sdk_dockerfile +++ b/tests/docker/python/python/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/python/python/sdk_entrypoint.sh b/tests/docker/python/python/sdk_entrypoint.sh index a0f305d..07dc15a 100644 --- a/tests/docker/python/python/sdk_entrypoint.sh +++ b/tests/docker/python/python/sdk_entrypoint.sh @@ -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' diff --git a/tests/docker/python/python3/monitor_dockerfile b/tests/docker/python/python3/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/python/python3/monitor_dockerfile +++ b/tests/docker/python/python3/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/python/python3/monitor_entrypoint.sh b/tests/docker/python/python3/monitor_entrypoint.sh index b57a317..3e94118 100644 --- a/tests/docker/python/python3/monitor_entrypoint.sh +++ b/tests/docker/python/python3/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/python/python3/sdk_dockerfile b/tests/docker/python/python3/sdk_dockerfile index 12f7afc..8716095 100644 --- a/tests/docker/python/python3/sdk_dockerfile +++ b/tests/docker/python/python3/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/python/python3/sdk_entrypoint.sh b/tests/docker/python/python3/sdk_entrypoint.sh index c375133..607f170 100644 --- a/tests/docker/python/python3/sdk_entrypoint.sh +++ b/tests/docker/python/python3/sdk_entrypoint.sh @@ -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' diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile index e6cd65a..3c89941 100644 --- a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile +++ b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh index 81b054c..bd6b70e 100644 --- a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh +++ b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_dockerfile b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_dockerfile index 5a18cb9..f22b545 100644 --- a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_dockerfile +++ b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_entrypoint.sh b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_entrypoint.sh index 7665f5c..0d04e2f 100644 --- a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_entrypoint.sh +++ b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_entrypoint.sh @@ -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' diff --git a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile index d2d2a0c..c5c7c7e 100644 --- a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile +++ b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test Monitor +# ZT SDK Test Monitor FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh index 66f66f0..c9181cb 100644 --- a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh +++ b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh @@ -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' diff --git a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_dockerfile b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_dockerfile index b2b61c0..65ac2c5 100644 --- a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_dockerfile +++ b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_dockerfile @@ -1,4 +1,4 @@ -# ZT Network Containers Test +# ZT SDK Test FROM fedora:23 MAINTAINER https://www.zerotier.com/ diff --git a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_entrypoint.sh b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_entrypoint.sh index b52b9f6..1216d99 100644 --- a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_entrypoint.sh +++ b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_entrypoint.sh @@ -18,7 +18,7 @@ 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 ./zerotier-one -d -U -p9993