summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Henry <joseph.henry@zerotier.com>2015-09-29 14:32:07 -0400
committerJoseph Henry <joseph.henry@zerotier.com>2015-09-29 14:32:07 -0400
commit4983fd37765743b2732efb54c3410f51fe1733dd (patch)
tree2ae27028b072651095100f7634300f806128a761
parentcc10d4f3102bbd39bc568d79b0f415f167739ccb (diff)
downloadinfinitytier-4983fd37765743b2732efb54c3410f51fe1733dd.tar.gz
infinitytier-4983fd37765743b2732efb54c3410f51fe1733dd.zip
Recompiled ZTO binary with fix + moves index.html to var/www
-rw-r--r--docker-test/Dockerfile5
-rwxr-xr-xdocker-test/zerotier-onebin5635680 -> 5635680 bytes
2 files changed, 5 insertions, 0 deletions
diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile
index 2fae6780..a5de2140 100644
--- a/docker-test/Dockerfile
+++ b/docker-test/Dockerfile
@@ -13,6 +13,8 @@ ADD zerotier-cli /
ADD intercept /
ADD lib/libintercept.so.1.0 /
ADD lib/liblwip.so /
+ADD htdocs/index.html /
+ADD htdocs/ZeroTierIcon.png /
RUN cp libintercept.so.1.0 lib/libintercept.so.1.0
RUN cp liblwip.so lib/liblwip.so
@@ -25,6 +27,9 @@ RUN /usr/bin/install -c intercept /usr/bin
RUN echo "Apache" >> /var/www/html/index.html
EXPOSE 9993/udp
+RUN mv index.html /var/www/html/index.html
+RUN mv ZeroTierIcon.png /var/www/html/ZeroTierIcon.png
+
# Start ZeroTier-One
RUN mkdir -p /var/lib/zerotier-one/networks.d
RUN touch /var/lib/zerotier-one/networks.d/8056c2e21c000001.conf
diff --git a/docker-test/zerotier-one b/docker-test/zerotier-one
index 3ba794b5..372bed32 100755
--- a/docker-test/zerotier-one
+++ b/docker-test/zerotier-one
Binary files differ