diff --git a/integrations/Docker/README.md b/integrations/Docker/README.md index 0dc8c95..8f77f9f 100644 --- a/integrations/Docker/README.md +++ b/integrations/Docker/README.md @@ -5,7 +5,7 @@ Welcome! Imagine a flat, encrypted, no-configuration LAN for all of your Docker containers. -This short tutorial will show you how to enable ZeroTier functionality for your Docker software container with little to no configuration. In this example we aim to build a Docker container with ZeroTier’s Network Container service bundled right in so that it’s effortless to hook any number of your services in the container up to your virtual network. +This short tutorial will show you how to enable ZeroTier functionality for your Docker software container with little to no configuration. In this example we aim to build a Docker container with ZeroTier’s SDK service bundled right in so that it’s effortless to hook any number of your services in the container up to your virtual network. **Step 1: Build the ZeroTier service binaries** diff --git a/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index 9707871..8612e82 100644 Binary files a/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate and b/integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/integrations/docker/docker_demo/_results/OK.docker_demo.txt b/integrations/docker/docker_demo/_results/OK.docker_demo.txt new file mode 100644 index 0000000..7cb05a7 --- /dev/null +++ b/integrations/docker/docker_demo/_results/OK.docker_demo.txt @@ -0,0 +1 @@ +Test: redis-server responded! diff --git a/integrations/docker/docker_demo/_results/docker_demo_addr.tmp b/integrations/docker/docker_demo/_results/docker_demo_addr.tmp new file mode 100644 index 0000000..4b13e1b --- /dev/null +++ b/integrations/docker/docker_demo/_results/docker_demo_addr.tmp @@ -0,0 +1 @@ +10.5.5.203 diff --git a/integrations/docker/docker_demo/monitor_entrypoint.sh b/integrations/docker/docker_demo/monitor_entrypoint.sh index a13b0a8..6b85ac2 100644 --- a/integrations/docker/docker_demo/monitor_entrypoint.sh +++ b/integrations/docker/docker_demo/monitor_entrypoint.sh @@ -2,13 +2,12 @@ export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/ - # --- Test Parameters --- test_namefile=$(ls *.name) test_name="${test_namefile%.*}" # test network id nwconf=$(ls *.conf) # blank test network config file nwid="${nwconf%.*}" # test network id -sdk_wait_time=25 # wait for test container to come online +sdk_wait_time=60 # 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 @@ -17,7 +16,6 @@ ok=OK. # appended to result file in event of success tmp_ext=.tmp # temporary filetype used for sharing test data between containers address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional) - # --- Network Config --- echo '*** ZeroTier SDK Test Monitor' chown -R daemon /var/lib/zerotier-one @@ -34,12 +32,12 @@ echo '*** Sleeping for (' "$sdk_wait_time" 's ) while we wait for the containe sleep "$sdk_wait_time"s ncvirtip=$(<$address_file) - # --- Test section --- echo '*** Running lua script against redis host at' $ncvirtip redis-cli -h $ncvirtip EVAL "$(cat hello.lua)" 0 > redis_response.txt response_string=$(