Moved/Renamed Docker test dirs

9 files changed, 0 insertions, 124 deletions

diff --git a/docker-test/throughput-test/Dockerfile b/docker-test/throughput-test/Dockerfile
deleted file mode 100644
index 71549754..00000000
--- a/docker-test/throughput-test/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-# ZT Netcon Throughput test
-FROM fedora:23
-MAINTAINER https://www.zerotier.com/
-
-# Install apps
-RUN yum -y update
-RUN yum -y install httpd-2.4.16-1.fc23
-RUN yum -y install nano
-RUN yum clean all
-
-EXPOSE 9993/udp 9992/udp 9991/udp 9990/udp
-
-# Install sys-call intercept library
-ADD intercept /
-ADD libintercept.so.1.0 /
-RUN cp libintercept.so.1.0 lib/libintercept.so.1.0
-RUN cp libintercept.so.1.0 /lib/libintercept.so.1.0
-RUN ln -sf /lib/libintercept.so.1.0 /lib/libintercept
-RUN /usr/bin/install -c intercept /usr/bin
-
-# Add ZT files
-RUN mkdir -p /var/lib/zerotier-one/networks.d
-RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf
-ADD zerotier-one /
-ADD zerotier-cli /
-
-# Install test-setup scripts
-ADD generate_file.sh /generate_file.sh
-RUN chmod -v +x /generate_file.sh
-ADD entrypoint.sh /entrypoint.sh
-RUN chmod -v +x /entrypoint.sh
-
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
-# Start ZeroTier-One
-CMD ["./entrypoint.sh"]
diff --git a/docker-test/throughput-test/build.sh b/docker-test/throughput-test/build.sh
deleted file mode 100755
index 586c8931..00000000
--- a/docker-test/throughput-test/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-cd ../../
-make clean
-make
-cd netcon
-make -f make-intercept.mk lib
-rm *.o
-rm liblwip.so
-make -f make-liblwip.mk
-cd ../docker-test/throughput-test
-
-cp ../../zerotier-one zerotier-one
-cp ../../zerotier-cli zerotier-cli
-
-cp ../../netcon/liblwip.so liblwip.so
-cp ../../netcon/libintercept.so.1.0 libintercept.so.1.0
-
diff --git a/docker-test/throughput-test/entrypoint.sh b/docker-test/throughput-test/entrypoint.sh
deleted file mode 100644
index 00fdd2be..00000000
--- a/docker-test/throughput-test/entrypoint.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
-
-echo '***'
-echo '*** ZeroTier Network Containers Test Image'
-echo '*** https://www.zerotier.com/'
-echo '***'
-
-./zerotier-one &
-./zerotier-cli join e5cd7a9e1c5311ab
-./zerotier-cli listnetworks
-
-
diff --git a/docker-test/throughput-test/generate_file.sh b/docker-test/throughput-test/generate_file.sh
deleted file mode 100644
index fd84de32..00000000
--- a/docker-test/throughput-test/generate_file.sh
+++ /dev/null
@@ -1 +0,0 @@
-dd if=/dev/urandom of=/var/www/html/bigfile  bs=100M  count=1
diff --git a/docker-test/throughput-test/intercept b/docker-test/throughput-test/intercept
deleted file mode 100755
index 3eb27ff7..00000000
--- a/docker-test/throughput-test/intercept
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-# usage:
-# /usr/bin/intercept program <args>
-
-if [ $# = 0 ] ; then
-   echo "$0: insufficient arguments"
-   exit
-fi
-
-case "$1" in
-	on)
-		if [ -z "$LD_PRELOAD" ]
-			then
-				export LD_PRELOAD="/lib/libintercept.so.1.0"
-			else
-				echo $LD_PRELOAD | grep -q "/lib/libintercept\.so.1.0" || \
-				export LD_PRELOAD="/lib/libintercept.so $LD_PRELOAD"
-		fi
-	;;
-	off)
-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libintercept.so.1.0 \?//'`
-		if [ -z "$LD_PRELOAD" ]
-			then
-				unset LD_PRELOAD
-		fi
-	;;
-	show|sh)
-		echo "LD_PRELOAD=\"$LD_PRELOAD\""
-	;;
-	-h|-?)
-      echo ""
-   ;;
-	*)
-		if [ -z "$LD_PRELOAD" ]
-		then
-			export LD_PRELOAD="/lib/libintercept.so.1.0"
-		else
-			echo $LD_PRELOAD | grep -q "/lib/libintercept\.so.1.0" || \
-			export LD_PRELOAD="/lib/libintercept.so.1.0 $LD_PRELOAD"
-		fi
-
-		if [ $# = 0 ]
-		then
-			${SHELL:-/bin/sh}
-		fi
-
-		if [ $# -gt 0 ]
-		then
-			exec "$@"
-		fi
-	;;
-esac
-
-#EOF
diff --git a/docker-test/throughput-test/libintercept.so.1.0 b/docker-test/throughput-test/libintercept.so.1.0
deleted file mode 100755
index 7a451408..00000000
--- a/docker-test/throughput-test/libintercept.so.1.0
+++ /dev/null
diff --git a/docker-test/throughput-test/liblwip.so b/docker-test/throughput-test/liblwip.so
deleted file mode 100755
index 158169f1..00000000
--- a/docker-test/throughput-test/liblwip.so
+++ /dev/null
diff --git a/docker-test/throughput-test/zerotier-cli b/docker-test/throughput-test/zerotier-cli
deleted file mode 100755
index 020ee665..00000000
--- a/docker-test/throughput-test/zerotier-cli
+++ /dev/null
diff --git a/docker-test/throughput-test/zerotier-one b/docker-test/throughput-test/zerotier-one
deleted file mode 100755
index 020ee665..00000000
--- a/docker-test/throughput-test/zerotier-one
+++ /dev/null