Started work on automated unit test scripts

4 files changed, 31 insertions, 11 deletions

diff --git a/docker-test/httpd_demo/Dockerfile b/docker-test/httpd_demo/Dockerfile
index a5de2140..6e1e5a78 100644
--- a/docker-test/httpd_demo/Dockerfile
+++ b/docker-test/httpd_demo/Dockerfile
@@ -1,6 +1,5 @@
 # A basic harnessed application example using ZeroTier-One and user-space IP stack
-FROM fedora:20
-
+FROM fedora:23
 MAINTAINER https://www.zerotier.com/
 
 # Install Apache
@@ -8,32 +7,31 @@ RUN yum -y update && yum clean all
 RUN yum -y install httpd && yum clean all
 
 # Add files
-ADD zerotier-one /
-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
+
 
 # Install sys-call intercept library
+ADD zerotier-one /
+ADD zerotier-cli /
+ADD intercept /
+ADD libintercept.so.1.0 /
+ADD liblwip.so /
+RUN cp liblwip.so lib/liblwip.so
 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
 
+
 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
-
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod -v +x /entrypoint.sh
 CMD ["./entrypoint.sh"]
diff --git a/docker-test/httpd_demo/build.sh b/docker-test/httpd_demo/build.sh
new file mode 100755
index 00000000..a651fc1c
--- /dev/null
+++ b/docker-test/httpd_demo/build.sh
@@ -0,0 +1,18 @@
+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/httpd_demo
+
+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
+cp ../../netcon/intercept intercept
+
diff --git a/docker-test/httpd_demo/entrypoint.sh b/docker-test/httpd_demo/entrypoint.sh
index 3e8845b4..6cb6e199 100644
--- a/docker-test/httpd_demo/entrypoint.sh
+++ b/docker-test/httpd_demo/entrypoint.sh
@@ -2,6 +2,8 @@
 
 export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
 
+touch /opt/results/results.txt
+
 echo '***'
 echo '*** ZeroTier Network Containers Preview'
 echo '*** https://www.zerotier.com/'
diff --git a/docker-test/httpd_demo/test.sh b/docker-test/httpd_demo/test.sh
new file mode 100755
index 00000000..ad78f9b1
--- /dev/null
+++ b/docker-test/httpd_demo/test.sh
@@ -0,0 +1,2 @@
+docker build --tag="throughput_httpd_2.4.6" .
+docker run -it -v $PWD/../_results:/opt/results --device=/dev/net/tun throughput_httpd_2.4.6:latest