diff --git a/.gitignore b/.gitignore index 7129b8e..2eaad9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,16 @@ +# Xcode/OSX *.xcuserstate -*.DS_Store \ No newline at end of file +*.DS_Store + +# Android Studio +*.idea +*.gradle + +# Unity +*.meta +integrations/Unity3D/Library +integrations/Unity3D/Temp +integrations/Unity3D/obj + +# Docker test +*.tmp \ No newline at end of file diff --git a/docs/docker_linux_zt_sdk.md b/docs/docker_linux_zt_sdk.md index a1d9a63..da072ba 100644 --- a/docs/docker_linux_zt_sdk.md +++ b/docs/docker_linux_zt_sdk.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 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. Alternatively, you can check out a docker project directory [here](sdk/integrations/docker/docker_demo). **Step 1: Build ZeroTier shared library** diff --git a/integrations/README.md b/integrations/README.md index 5ad8b40..70117c7 100644 --- a/integrations/README.md +++ b/integrations/README.md @@ -12,22 +12,13 @@ Below are the specific instructions for each integration requiring *little to no For more support on these integrations, or if you'd like help creating a new integration, stop by our [community section](https://www.zerotier.com/community/)! *** -## Build flags +## Important Build flags - `SDK_DEBUG` - Turns on SDK activity/warning/error output. Levels of verbosity can be adjusted in `src/SDK_Debug.h` - - `SDK_DEBUG_LOGFILE` - Used in conjunction with `SDK_DEBUG`, this will write all SDK debug chatter to a log file. To use this, set `make SDK_DEBUG_LOGFILE=1` then `export ZT_SDK_LOGFILE=debug.log`. - - `SDK_LWIP_DEBUG` - Turns on debug output for the lwIP library. - -- `SDK_BUNDLED` - Builds the SDK as a single target including an API shim, the lwIP library, and the ZeroTier service. - -- `SDK_SERVICE` - -- `SDK_SOCKS_PROXY` - Enables the SOCK5 Proxy. - -- `SDK_UNITY_3D` - For use when building a target for a native plugin for Unity3D. - +- `SDK_BUNDLED` - Builds the SDK as a single bundled target including a the RPC mechanism, the lwIP library, and the ZeroTier service. +- `SDK_SOCKS_PROXY` - Enables the SOCK5 Proxy. This flag is enabled by default on must builds, especially mobile. *** ## Current Integrations diff --git a/integrations/docker/docker_demo/_results/OK.docker_demo.txt b/integrations/docker/docker_demo/_results/OK.docker_demo.txt deleted file mode 100644 index 7cb05a7..0000000 --- a/integrations/docker/docker_demo/_results/OK.docker_demo.txt +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 4b13e1b..0000000 --- a/integrations/docker/docker_demo/_results/docker_demo_addr.tmp +++ /dev/null @@ -1 +0,0 @@ -10.5.5.203