From 5c5943a00c38f2540c6d30616e1b48222d1fa6c2 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Thu, 3 Dec 2015 07:11:33 -0800 Subject: (fixed) test script liblwip.so placement, also streamlined test logic --- .../httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile | 8 +-- .../monitor_entrypoint.sh | 12 +--- .../httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile | 10 ++-- .../netcon_entrypoint.sh | 8 --- .../httpd/httpd-2.4.16-1.fc23.x86_64/test.sh | 40 ------------- .../httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile | 8 +-- .../monitor_entrypoint.sh | 12 +--- .../httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile | 10 ++-- .../netcon_entrypoint.sh | 8 --- .../httpd/httpd-2.4.17-3.fc23.x86_64/test.sh | 40 ------------- netcon/docker-test/httpd/httpd_demo/test.sh | 40 ------------- .../nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile | 8 +-- .../monitor_entrypoint.sh | 12 +--- .../nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile | 10 ++-- .../netcon_entrypoint.sh | 8 --- .../nginx/nginx-1.8.0-13.fc23.x86_64/test.sh | 40 ------------- .../nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile | 8 +-- .../monitor_entrypoint.sh | 12 +--- .../nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile | 10 ++-- .../netcon_entrypoint.sh | 8 --- .../nginx/nginx-1.8.0-14.fc23.x86_64/test.sh | 40 ------------- .../nodejs-0.10.36-4.fc23/monitor_dockerfile | 8 +-- .../nodejs-0.10.36-4.fc23/monitor_entrypoint.sh | 8 --- .../nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile | 8 +-- .../nodejs-0.10.36-4.fc23/netcon_entrypoint.sh | 8 --- .../nodejs/nodejs-0.10.36-4.fc23/test.sh | 40 ------------- .../redis-3.0.4-1.fc23.x86_64/monitor_dockerfile | 8 +-- .../monitor_entrypoint.sh | 8 --- .../redis-3.0.4-1.fc23.x86_64/netcon_dockerfile | 8 +-- .../redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh | 8 --- .../redis/redis-3.0.4-1.fc23.x86_64/test.sh | 40 ------------- .../monitor_dockerfile | 25 --------- .../monitor_entrypoint.sh | 65 ---------------------- .../netcon_dockerfile | 41 -------------- .../netcon_entrypoint.sh | 59 -------------------- .../ openssh-server-7.1p1-3.fc23.x86_64/test.sh | 40 ------------- .../monitor_dockerfile | 23 ++++++++ .../monitor_entrypoint.sh | 57 +++++++++++++++++++ .../netcon_dockerfile | 39 +++++++++++++ .../netcon_entrypoint.sh | 51 +++++++++++++++++ .../two_party_test.sh | 41 ++++++++++++++ netcon/docker-test/test.sh | 59 +++++++------------- netcon/docker-test/two_party_test.sh | 41 ++++++++++++++ 43 files changed, 323 insertions(+), 714 deletions(-) delete mode 100755 netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/test.sh delete mode 100755 netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/test.sh delete mode 100755 netcon/docker-test/httpd/httpd_demo/test.sh delete mode 100755 netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/test.sh delete mode 100755 netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/test.sh delete mode 100755 netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh delete mode 100755 netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/test.sh delete mode 100644 netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile delete mode 100644 netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh delete mode 100644 netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile delete mode 100644 netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh delete mode 100755 netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/test.sh create mode 100644 netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile create mode 100644 netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh create mode 100644 netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile create mode 100644 netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh create mode 100755 netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/two_party_test.sh create mode 100755 netcon/docker-test/two_party_test.sh (limited to 'netcon') diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile index 08f08ae1..e8f803cd 100644 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile +++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_dockerfile @@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/ EXPOSE 9993/udp +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + # Add ZT files RUN mkdir -p /var/lib/zerotier-one/networks.d ADD monitor_identity.public /var/lib/zerotier-one/identity.public @@ -14,11 +17,6 @@ ADD *.name / ADD zerotier-one / ADD zerotier-cli / -# 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 ADD monitor_entrypoint.sh /monitor_entrypoint.sh RUN chmod -v +x /monitor_entrypoint.sh diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh index 79d4391d..9e8f7253 100644 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh @@ -26,15 +26,7 @@ echo '*** ZeroTier Network Containers Test Monitor' chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` @@ -63,7 +55,7 @@ tx_md5sum=$(<$tx_md5sumfile) echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum" -if [ $rx_md5sum != $tx_md5sum ]; +if [ "$rx_md5sum" != "$tx_md5sum" ]; then echo 'MD5 FAIL' touch "$file_path$fail$test_name.txt" @@ -72,6 +64,8 @@ else echo 'MD5 OK' touch "$file_path$ok$test_name.txt" printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt" + cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt" + cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt" fi diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile index bc7aeb29..3de8ed3f 100644 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile +++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile @@ -7,7 +7,10 @@ RUN yum -y update RUN yum -y install httpd-2.4.16-1.fc23.x86_64 RUN yum clean all -EXPOSE 9993/udp +EXPOSE 9993/udp 80/udp + +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so # Install syscall intercept library ADD zerotier-intercept / @@ -32,10 +35,5 @@ ADD zerotier-cli / ADD netcon_entrypoint.sh /netcon_entrypoint.sh RUN chmod -v +x /netcon_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 ["./netcon_entrypoint.sh"] diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh index fd47cf38..37277d53 100644 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh @@ -22,15 +22,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/test.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/test.sh deleted file mode 100755 index fa8daddd..00000000 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/test.sh +++ /dev/null @@ -1,40 +0,0 @@ - -test_name=${PWD##*/} -echo 'Building dockerfiles for test: ' "$test_name" -touch "$test_name".name - -# Docker won't allow the inclusion of files outside of the build directory -cp ../../*.conf . -cp ../../zerotier-one zerotier-one -cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-intercept zerotier-intercept -cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 -cp ../../liblwip.so liblwip.so -cp ../../netcon_identity.public netcon_identity.public -cp ../../netcon_identity.secret netcon_identity.secret -cp ../../monitor_identity.public monitor_identity.public -cp ../../monitor_identity.secret monitor_identity.secret - -docker build --tag="$test_name" -f netcon_dockerfile . -docker build --tag="$test_name"_monitor -f monitor_dockerfile . - -rm -f zerotier-one -rm -f zerotier-cli -rm -f zerotier-intercept -rm -f libzerotierintercept.so.1.0 -rm -f liblwip.so -rm -f netcon_identity.public -rm -f netcon_identity.secret -rm -f monitor_identity.public -rm -f monitor_identity.secret -rm -f *.conf -rm -f *.name - -# Start netcon container to be tested -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest - -sleep 45s -docker kill $(docker ps -a -q) - -rm -rf ../../_results/*.tmp \ No newline at end of file diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile index 08f08ae1..e8f803cd 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile +++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_dockerfile @@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/ EXPOSE 9993/udp +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + # Add ZT files RUN mkdir -p /var/lib/zerotier-one/networks.d ADD monitor_identity.public /var/lib/zerotier-one/identity.public @@ -14,11 +17,6 @@ ADD *.name / ADD zerotier-one / ADD zerotier-cli / -# 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 ADD monitor_entrypoint.sh /monitor_entrypoint.sh RUN chmod -v +x /monitor_entrypoint.sh diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh index 79d4391d..9e8f7253 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh @@ -26,15 +26,7 @@ echo '*** ZeroTier Network Containers Test Monitor' chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` @@ -63,7 +55,7 @@ tx_md5sum=$(<$tx_md5sumfile) echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum" -if [ $rx_md5sum != $tx_md5sum ]; +if [ "$rx_md5sum" != "$tx_md5sum" ]; then echo 'MD5 FAIL' touch "$file_path$fail$test_name.txt" @@ -72,6 +64,8 @@ else echo 'MD5 OK' touch "$file_path$ok$test_name.txt" printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt" + cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt" + cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt" fi diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile index cce18b81..3a17acdd 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile +++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile @@ -7,7 +7,10 @@ RUN yum -y update RUN yum -y install httpd-2.4.17-3.fc23.x86_64 RUN yum clean all -EXPOSE 9993/udp +EXPOSE 9993/udp 80/udp + +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so # Install syscall intercept library ADD zerotier-intercept / @@ -32,10 +35,5 @@ ADD zerotier-cli / ADD netcon_entrypoint.sh /netcon_entrypoint.sh RUN chmod -v +x /netcon_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 ["./netcon_entrypoint.sh"] diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh index fd47cf38..37277d53 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh @@ -22,15 +22,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/test.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/test.sh deleted file mode 100755 index fa8daddd..00000000 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/test.sh +++ /dev/null @@ -1,40 +0,0 @@ - -test_name=${PWD##*/} -echo 'Building dockerfiles for test: ' "$test_name" -touch "$test_name".name - -# Docker won't allow the inclusion of files outside of the build directory -cp ../../*.conf . -cp ../../zerotier-one zerotier-one -cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-intercept zerotier-intercept -cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 -cp ../../liblwip.so liblwip.so -cp ../../netcon_identity.public netcon_identity.public -cp ../../netcon_identity.secret netcon_identity.secret -cp ../../monitor_identity.public monitor_identity.public -cp ../../monitor_identity.secret monitor_identity.secret - -docker build --tag="$test_name" -f netcon_dockerfile . -docker build --tag="$test_name"_monitor -f monitor_dockerfile . - -rm -f zerotier-one -rm -f zerotier-cli -rm -f zerotier-intercept -rm -f libzerotierintercept.so.1.0 -rm -f liblwip.so -rm -f netcon_identity.public -rm -f netcon_identity.secret -rm -f monitor_identity.public -rm -f monitor_identity.secret -rm -f *.conf -rm -f *.name - -# Start netcon container to be tested -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest - -sleep 45s -docker kill $(docker ps -a -q) - -rm -rf ../../_results/*.tmp \ No newline at end of file diff --git a/netcon/docker-test/httpd/httpd_demo/test.sh b/netcon/docker-test/httpd/httpd_demo/test.sh deleted file mode 100755 index fa8daddd..00000000 --- a/netcon/docker-test/httpd/httpd_demo/test.sh +++ /dev/null @@ -1,40 +0,0 @@ - -test_name=${PWD##*/} -echo 'Building dockerfiles for test: ' "$test_name" -touch "$test_name".name - -# Docker won't allow the inclusion of files outside of the build directory -cp ../../*.conf . -cp ../../zerotier-one zerotier-one -cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-intercept zerotier-intercept -cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 -cp ../../liblwip.so liblwip.so -cp ../../netcon_identity.public netcon_identity.public -cp ../../netcon_identity.secret netcon_identity.secret -cp ../../monitor_identity.public monitor_identity.public -cp ../../monitor_identity.secret monitor_identity.secret - -docker build --tag="$test_name" -f netcon_dockerfile . -docker build --tag="$test_name"_monitor -f monitor_dockerfile . - -rm -f zerotier-one -rm -f zerotier-cli -rm -f zerotier-intercept -rm -f libzerotierintercept.so.1.0 -rm -f liblwip.so -rm -f netcon_identity.public -rm -f netcon_identity.secret -rm -f monitor_identity.public -rm -f monitor_identity.secret -rm -f *.conf -rm -f *.name - -# Start netcon container to be tested -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest - -sleep 45s -docker kill $(docker ps -a -q) - -rm -rf ../../_results/*.tmp \ No newline at end of file diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile index 08f08ae1..e8f803cd 100644 --- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile +++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile @@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/ EXPOSE 9993/udp +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + # Add ZT files RUN mkdir -p /var/lib/zerotier-one/networks.d ADD monitor_identity.public /var/lib/zerotier-one/identity.public @@ -14,11 +17,6 @@ ADD *.name / ADD zerotier-one / ADD zerotier-cli / -# 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 ADD monitor_entrypoint.sh /monitor_entrypoint.sh RUN chmod -v +x /monitor_entrypoint.sh diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh index d11fa686..9e8f7253 100644 --- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh +++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh @@ -26,15 +26,7 @@ echo '*** ZeroTier Network Containers Test Monitor' chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` @@ -63,7 +55,7 @@ tx_md5sum=$(<$tx_md5sumfile) echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum" -if [ ($rx_md5sum != $tx_md5sum) || ${#rx_md5sum}<5 || ${#tx_md5sum}<5 ]; +if [ "$rx_md5sum" != "$tx_md5sum" ]; then echo 'MD5 FAIL' touch "$file_path$fail$test_name.txt" @@ -72,6 +64,8 @@ else echo 'MD5 OK' touch "$file_path$ok$test_name.txt" printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt" + cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt" + cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt" fi diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile index 17d2287e..e7b4ad34 100644 --- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile +++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile @@ -7,7 +7,10 @@ RUN yum -y update RUN yum -y install nginx-1:1.8.0-13.fc23.x86_64 RUN yum clean all -EXPOSE 9993/udp +EXPOSE 9993/udp 80/udp + +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so # Install syscall intercept library ADD zerotier-intercept / @@ -32,10 +35,5 @@ ADD zerotier-cli / ADD netcon_entrypoint.sh /netcon_entrypoint.sh RUN chmod -v +x /netcon_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 ["./netcon_entrypoint.sh"] diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh index 3fd4ff4c..d1138111 100644 --- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh @@ -22,15 +22,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/test.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/test.sh deleted file mode 100755 index fa8daddd..00000000 --- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/test.sh +++ /dev/null @@ -1,40 +0,0 @@ - -test_name=${PWD##*/} -echo 'Building dockerfiles for test: ' "$test_name" -touch "$test_name".name - -# Docker won't allow the inclusion of files outside of the build directory -cp ../../*.conf . -cp ../../zerotier-one zerotier-one -cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-intercept zerotier-intercept -cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 -cp ../../liblwip.so liblwip.so -cp ../../netcon_identity.public netcon_identity.public -cp ../../netcon_identity.secret netcon_identity.secret -cp ../../monitor_identity.public monitor_identity.public -cp ../../monitor_identity.secret monitor_identity.secret - -docker build --tag="$test_name" -f netcon_dockerfile . -docker build --tag="$test_name"_monitor -f monitor_dockerfile . - -rm -f zerotier-one -rm -f zerotier-cli -rm -f zerotier-intercept -rm -f libzerotierintercept.so.1.0 -rm -f liblwip.so -rm -f netcon_identity.public -rm -f netcon_identity.secret -rm -f monitor_identity.public -rm -f monitor_identity.secret -rm -f *.conf -rm -f *.name - -# Start netcon container to be tested -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest - -sleep 45s -docker kill $(docker ps -a -q) - -rm -rf ../../_results/*.tmp \ No newline at end of file diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile index 08f08ae1..e8f803cd 100644 --- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile +++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile @@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/ EXPOSE 9993/udp +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + # Add ZT files RUN mkdir -p /var/lib/zerotier-one/networks.d ADD monitor_identity.public /var/lib/zerotier-one/identity.public @@ -14,11 +17,6 @@ ADD *.name / ADD zerotier-one / ADD zerotier-cli / -# 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 ADD monitor_entrypoint.sh /monitor_entrypoint.sh RUN chmod -v +x /monitor_entrypoint.sh diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh index 79d4391d..9e8f7253 100644 --- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh +++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh @@ -26,15 +26,7 @@ echo '*** ZeroTier Network Containers Test Monitor' chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` @@ -63,7 +55,7 @@ tx_md5sum=$(<$tx_md5sumfile) echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum" -if [ $rx_md5sum != $tx_md5sum ]; +if [ "$rx_md5sum" != "$tx_md5sum" ]; then echo 'MD5 FAIL' touch "$file_path$fail$test_name.txt" @@ -72,6 +64,8 @@ else echo 'MD5 OK' touch "$file_path$ok$test_name.txt" printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt" + cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt" + cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt" fi diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile index fcdff1aa..1888071e 100644 --- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile +++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile @@ -7,7 +7,10 @@ RUN yum -y update RUN yum -y install nginx-1:1.8.0-14.fc23.x86_64 RUN yum clean all -EXPOSE 9993/udp +EXPOSE 9993/udp 80/udp + +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so # Install syscall intercept library ADD zerotier-intercept / @@ -32,10 +35,5 @@ ADD zerotier-cli / ADD netcon_entrypoint.sh /netcon_entrypoint.sh RUN chmod -v +x /netcon_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 ["./netcon_entrypoint.sh"] diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh index 3fd4ff4c..d1138111 100644 --- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh @@ -22,15 +22,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/test.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/test.sh deleted file mode 100755 index fa8daddd..00000000 --- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/test.sh +++ /dev/null @@ -1,40 +0,0 @@ - -test_name=${PWD##*/} -echo 'Building dockerfiles for test: ' "$test_name" -touch "$test_name".name - -# Docker won't allow the inclusion of files outside of the build directory -cp ../../*.conf . -cp ../../zerotier-one zerotier-one -cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-intercept zerotier-intercept -cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 -cp ../../liblwip.so liblwip.so -cp ../../netcon_identity.public netcon_identity.public -cp ../../netcon_identity.secret netcon_identity.secret -cp ../../monitor_identity.public monitor_identity.public -cp ../../monitor_identity.secret monitor_identity.secret - -docker build --tag="$test_name" -f netcon_dockerfile . -docker build --tag="$test_name"_monitor -f monitor_dockerfile . - -rm -f zerotier-one -rm -f zerotier-cli -rm -f zerotier-intercept -rm -f libzerotierintercept.so.1.0 -rm -f liblwip.so -rm -f netcon_identity.public -rm -f netcon_identity.secret -rm -f monitor_identity.public -rm -f monitor_identity.secret -rm -f *.conf -rm -f *.name - -# Start netcon container to be tested -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest - -sleep 45s -docker kill $(docker ps -a -q) - -rm -rf ../../_results/*.tmp \ No newline at end of file diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile index 08f08ae1..e8f803cd 100644 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile +++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile @@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/ EXPOSE 9993/udp +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + # Add ZT files RUN mkdir -p /var/lib/zerotier-one/networks.d ADD monitor_identity.public /var/lib/zerotier-one/identity.public @@ -14,11 +17,6 @@ ADD *.name / ADD zerotier-one / ADD zerotier-cli / -# 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 ADD monitor_entrypoint.sh /monitor_entrypoint.sh RUN chmod -v +x /monitor_entrypoint.sh diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh index 0170ae00..1701a467 100644 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh +++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh @@ -23,15 +23,7 @@ echo '*** ZeroTier Network Containers Test Monitor' chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile index d0ce01de..ea2abd68 100644 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile +++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile @@ -9,6 +9,9 @@ RUN yum clean all EXPOSE 9993/udp 8080/udp +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + # ADD httpserver.js / @@ -35,10 +38,5 @@ ADD zerotier-cli / ADD netcon_entrypoint.sh /netcon_entrypoint.sh RUN chmod -v +x /netcon_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 ["./netcon_entrypoint.sh"] diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh index d18f3e1c..a6aadb9f 100644 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh +++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh @@ -19,15 +19,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh deleted file mode 100755 index fa8daddd..00000000 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh +++ /dev/null @@ -1,40 +0,0 @@ - -test_name=${PWD##*/} -echo 'Building dockerfiles for test: ' "$test_name" -touch "$test_name".name - -# Docker won't allow the inclusion of files outside of the build directory -cp ../../*.conf . -cp ../../zerotier-one zerotier-one -cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-intercept zerotier-intercept -cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 -cp ../../liblwip.so liblwip.so -cp ../../netcon_identity.public netcon_identity.public -cp ../../netcon_identity.secret netcon_identity.secret -cp ../../monitor_identity.public monitor_identity.public -cp ../../monitor_identity.secret monitor_identity.secret - -docker build --tag="$test_name" -f netcon_dockerfile . -docker build --tag="$test_name"_monitor -f monitor_dockerfile . - -rm -f zerotier-one -rm -f zerotier-cli -rm -f zerotier-intercept -rm -f libzerotierintercept.so.1.0 -rm -f liblwip.so -rm -f netcon_identity.public -rm -f netcon_identity.secret -rm -f monitor_identity.public -rm -f monitor_identity.secret -rm -f *.conf -rm -f *.name - -# Start netcon container to be tested -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest - -sleep 45s -docker kill $(docker ps -a -q) - -rm -rf ../../_results/*.tmp \ No newline at end of file diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile index 56e65dba..cbba716b 100644 --- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile +++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile @@ -6,6 +6,9 @@ RUN yum -y install redis-3.0.4-1.fc23.x86_64 EXPOSE 9993/udp +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + ADD hello.lua / # Add ZT files @@ -18,11 +21,6 @@ ADD *.name / ADD zerotier-one / ADD zerotier-cli / -# 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 ADD monitor_entrypoint.sh /monitor_entrypoint.sh RUN chmod -v +x /monitor_entrypoint.sh diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh index 69d9d595..087f50bb 100644 --- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh +++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh @@ -23,15 +23,7 @@ echo '*** ZeroTier Network Containers Test Monitor' chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile index 4ce78346..e2eed9fa 100644 --- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile +++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile @@ -9,6 +9,9 @@ RUN yum clean all EXPOSE 9993/udp 6379/udp +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + # Install syscall intercept library ADD zerotier-intercept / ADD libzerotierintercept.so.1.0 / @@ -32,10 +35,5 @@ ADD zerotier-cli / ADD netcon_entrypoint.sh /netcon_entrypoint.sh RUN chmod -v +x /netcon_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 ["./netcon_entrypoint.sh"] diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh index 185813f3..ff5b4259 100644 --- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh @@ -19,15 +19,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done while [ -z "$virtip4" ]; do sleep 0.2 virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/test.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/test.sh deleted file mode 100755 index fa8daddd..00000000 --- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/test.sh +++ /dev/null @@ -1,40 +0,0 @@ - -test_name=${PWD##*/} -echo 'Building dockerfiles for test: ' "$test_name" -touch "$test_name".name - -# Docker won't allow the inclusion of files outside of the build directory -cp ../../*.conf . -cp ../../zerotier-one zerotier-one -cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-intercept zerotier-intercept -cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 -cp ../../liblwip.so liblwip.so -cp ../../netcon_identity.public netcon_identity.public -cp ../../netcon_identity.secret netcon_identity.secret -cp ../../monitor_identity.public monitor_identity.public -cp ../../monitor_identity.secret monitor_identity.secret - -docker build --tag="$test_name" -f netcon_dockerfile . -docker build --tag="$test_name"_monitor -f monitor_dockerfile . - -rm -f zerotier-one -rm -f zerotier-cli -rm -f zerotier-intercept -rm -f libzerotierintercept.so.1.0 -rm -f liblwip.so -rm -f netcon_identity.public -rm -f netcon_identity.secret -rm -f monitor_identity.public -rm -f monitor_identity.secret -rm -f *.conf -rm -f *.name - -# Start netcon container to be tested -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest - -sleep 45s -docker kill $(docker ps -a -q) - -rm -rf ../../_results/*.tmp \ No newline at end of file diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile deleted file mode 100644 index 08f08ae1..00000000 --- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -# ZT Network Containers Test Monitor -FROM fedora:23 -MAINTAINER https://www.zerotier.com/ - -EXPOSE 9993/udp - -# Add ZT files -RUN mkdir -p /var/lib/zerotier-one/networks.d -ADD monitor_identity.public /var/lib/zerotier-one/identity.public -ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret -ADD *.conf /var/lib/zerotier-one/networks.d/ -ADD *.conf / -ADD *.name / -ADD zerotier-one / -ADD zerotier-cli / - -# 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 -ADD monitor_entrypoint.sh /monitor_entrypoint.sh -RUN chmod -v +x /monitor_entrypoint.sh -CMD ["./monitor_entrypoint.sh"] diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh deleted file mode 100644 index ec3dd7fa..00000000 --- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -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 -netcon_wait_time=25 # 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 -fail=FAIL. # appended to result file in event of failure -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) -bigfile_name=bigfile # large, random test transfer file -rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext" -tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" - - -# --- Network Config --- -echo '*** ZeroTier Network Containers Test Monitor' -chown -R daemon /var/lib/zerotier-one -chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' -virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done -while [ -z "$virtip4" ]; do - sleep 0.2 - virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` -done -echo '*** Starting Test...' -echo '*** Up and running at' $virtip4 ' on network: ' $nwid -echo '*** Sleeping for (' "$netcon_wait_time" 's ) while we wait for the Network Container to come online...' -sleep "$netcon_wait_time"s -ncvirtip=$(<$address_file) - - -# --- Test section --- -echo '*** Copying file to intercepted server at' $ncvirtip -touch "$bigfile_name" - -# Check md5 -md5sum < "$bigfile_name" >> "$rx_md5sumfile" -tx_md5sum=$(<$tx_md5sumfile) - -# ... - - - - - - - - diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile deleted file mode 100644 index 95088b53..00000000 --- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# ZT Network Containers Test -FROM fedora:23 -MAINTAINER https://www.zerotier.com/ - -# Install apps -RUN yum -y update -RUN yum -y install openssh-server -RUN yum clean all - -EXPOSE 9993/udp - -# Install syscall intercept library -ADD zerotier-intercept / -ADD libzerotierintercept.so.1.0 / -RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0 -RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0 -RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept -RUN /usr/bin/install -c zerotier-intercept /usr/bin - -# Add ZT files -RUN mkdir -p /var/lib/zerotier-one/networks.d -ADD netcon_identity.public /var/lib/zerotier-one/identity.public -ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret -ADD *.conf /var/lib/zerotier-one/networks.d/ -ADD *.conf / -ADD *.name / - -ADD zerotier-one / -ADD zerotier-cli / - -# Install test scripts -ADD netcon_entrypoint.sh /netcon_entrypoint.sh -RUN chmod -v +x /netcon_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 ["./netcon_entrypoint.sh"] diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh deleted file mode 100644 index 10a08eb2..00000000 --- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -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 -file_path=/opt/results/ # test result output file path (fs shared between host and containers) -file_base="$test_name".txt # test result output file -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) -bigfile_name=bigfile -bigfile_size=10M # size of file we want to use for the test -tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" - - -# --- Network Config --- -echo '*** ZeroTier Network Containers Test: ' "$test_name" -chown -R daemon /var/lib/zerotier-one -chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' -echo '*** Waiting for initial identity generation...' -while [ ! -s /var/lib/zerotier-one/identity.secret ]; do - sleep 0.2 -done -echo '*** Waiting for network config...' -virtip4="" -while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do - sleep 0.2 -done -while [ -z "$virtip4" ]; do - sleep 0.2 - virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` -done -echo '*** Up and running at' $virtip4 ' on network: ' $nwid -echo '*** Writing address to ' "$address_file" -echo $virtip4 > "$address_file" - - -# --- Test section --- -# Generate large random file for transfer test, share md5sum for monitor container to check -echo '*** Generating ' "$bigfile_size" ' file' -dd if=/dev/urandom of=/var/www/html/"$bigfile_name" bs="$bigfile_size" count=1 -#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile" -md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile" -echo '*** Wrote MD5 sum to ' "$tx_md5sumfile" - -echo '*** Starting application...' -sleep 0.5 - -# wait for rsa public key from monitor -#while [ ! -s "$file_path$rsa_public_key_file" ]; do -# sleep 0.2 -#done - -zerotier-intercept /usr/sbin/sshd diff --git a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/test.sh b/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/test.sh deleted file mode 100755 index fa8daddd..00000000 --- a/netcon/docker-test/sshd/ openssh-server-7.1p1-3.fc23.x86_64/test.sh +++ /dev/null @@ -1,40 +0,0 @@ - -test_name=${PWD##*/} -echo 'Building dockerfiles for test: ' "$test_name" -touch "$test_name".name - -# Docker won't allow the inclusion of files outside of the build directory -cp ../../*.conf . -cp ../../zerotier-one zerotier-one -cp ../../zerotier-cli zerotier-cli -cp ../../zerotier-intercept zerotier-intercept -cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 -cp ../../liblwip.so liblwip.so -cp ../../netcon_identity.public netcon_identity.public -cp ../../netcon_identity.secret netcon_identity.secret -cp ../../monitor_identity.public monitor_identity.public -cp ../../monitor_identity.secret monitor_identity.secret - -docker build --tag="$test_name" -f netcon_dockerfile . -docker build --tag="$test_name"_monitor -f monitor_dockerfile . - -rm -f zerotier-one -rm -f zerotier-cli -rm -f zerotier-intercept -rm -f libzerotierintercept.so.1.0 -rm -f liblwip.so -rm -f netcon_identity.public -rm -f netcon_identity.secret -rm -f monitor_identity.public -rm -f monitor_identity.secret -rm -f *.conf -rm -f *.name - -# Start netcon container to be tested -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest -docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest - -sleep 45s -docker kill $(docker ps -a -q) - -rm -rf ../../_results/*.tmp \ No newline at end of file diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile new file mode 100644 index 00000000..e8f803cd --- /dev/null +++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile @@ -0,0 +1,23 @@ +# ZT Network Containers Test Monitor +FROM fedora:23 +MAINTAINER https://www.zerotier.com/ + +EXPOSE 9993/udp + +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + +# Add ZT files +RUN mkdir -p /var/lib/zerotier-one/networks.d +ADD monitor_identity.public /var/lib/zerotier-one/identity.public +ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret +ADD *.conf /var/lib/zerotier-one/networks.d/ +ADD *.conf / +ADD *.name / +ADD zerotier-one / +ADD zerotier-cli / + +# Start ZeroTier-One +ADD monitor_entrypoint.sh /monitor_entrypoint.sh +RUN chmod -v +x /monitor_entrypoint.sh +CMD ["./monitor_entrypoint.sh"] diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh new file mode 100644 index 00000000..d617bd4a --- /dev/null +++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +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 +netcon_wait_time=25 # 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 +fail=FAIL. # appended to result file in event of failure +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) +bigfile_name=bigfile # large, random test transfer file +rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext" +tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" + + +# --- Network Config --- +echo '*** ZeroTier Network Containers Test Monitor' +chown -R daemon /var/lib/zerotier-one +chgrp -R daemon /var/lib/zerotier-one +su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' +virtip4="" +while [ -z "$virtip4" ]; do + sleep 0.2 + virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` +done +echo '*** Starting Test...' +echo '*** Up and running at' $virtip4 ' on network: ' $nwid +echo '*** Sleeping for (' "$netcon_wait_time" 's ) while we wait for the Network Container to come online...' +sleep "$netcon_wait_time"s +ncvirtip=$(<$address_file) + + +# --- Test section --- +echo '*** Copying file to intercepted server at' $ncvirtip +touch "$bigfile_name" + +# Check md5 +md5sum < "$bigfile_name" >> "$rx_md5sumfile" +tx_md5sum=$(<$tx_md5sumfile) + +# ... + + + + + + + + diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile new file mode 100644 index 00000000..ddb0a6c4 --- /dev/null +++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile @@ -0,0 +1,39 @@ +# ZT Network Containers Test +FROM fedora:23 +MAINTAINER https://www.zerotier.com/ + +# Install apps +RUN yum -y update +RUN yum -y install openssh-server +RUN yum clean all + +EXPOSE 9993/udp + +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + +# Install syscall intercept library +ADD zerotier-intercept / +ADD libzerotierintercept.so.1.0 / +RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0 +RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0 +RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept +RUN /usr/bin/install -c zerotier-intercept /usr/bin + +# Add ZT files +RUN mkdir -p /var/lib/zerotier-one/networks.d +ADD netcon_identity.public /var/lib/zerotier-one/identity.public +ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret +ADD *.conf /var/lib/zerotier-one/networks.d/ +ADD *.conf / +ADD *.name / + +ADD zerotier-one / +ADD zerotier-cli / + +# Install test scripts +ADD netcon_entrypoint.sh /netcon_entrypoint.sh +RUN chmod -v +x /netcon_entrypoint.sh + +# Start ZeroTier-One +CMD ["./netcon_entrypoint.sh"] diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh new file mode 100644 index 00000000..a8784d5c --- /dev/null +++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +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 +file_path=/opt/results/ # test result output file path (fs shared between host and containers) +file_base="$test_name".txt # test result output file +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) +bigfile_name=bigfile +bigfile_size=10M # size of file we want to use for the test +tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" + + +# --- Network Config --- +echo '*** ZeroTier Network Containers Test: ' "$test_name" +chown -R daemon /var/lib/zerotier-one +chgrp -R daemon /var/lib/zerotier-one +./zerotier-one -d -U -p9993 +virtip4="" +while [ -z "$virtip4" ]; do + sleep 0.2 + virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` +done +echo '*** Up and running at' $virtip4 ' on network: ' $nwid +echo '*** Writing address to ' "$address_file" +echo $virtip4 > "$address_file" + + +# --- Test section --- +# Generate large random file for transfer test, share md5sum for monitor container to check +echo '*** Generating ' "$bigfile_size" ' file' +dd if=/dev/urandom of=/var/www/html/"$bigfile_name" bs="$bigfile_size" count=1 +#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile" +md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile" +echo '*** Wrote MD5 sum to ' "$tx_md5sumfile" + +echo '*** Starting application...' +sleep 0.5 + +# wait for rsa public key from monitor +#while [ ! -s "$file_path$rsa_public_key_file" ]; do +# sleep 0.2 +#done + +zerotier-intercept /usr/sbin/sshd diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/two_party_test.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/two_party_test.sh new file mode 100755 index 00000000..b054b34b --- /dev/null +++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/two_party_test.sh @@ -0,0 +1,41 @@ + +test_name=${PWD##*/} +echo 'Building dockerfiles for test: ' "$test_name" +touch "$test_name".name + +# Docker won't allow the inclusion of files outside of the build directory +cp ../../*.conf . +cp ../../zerotier-one zerotier-one +cp ../../zerotier-cli zerotier-cli +cp ../../zerotier-intercept zerotier-intercept +cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 +cp ../../liblwip.so liblwip.so +cp ../../netcon_identity.public netcon_identity.public +cp ../../netcon_identity.secret netcon_identity.secret +cp ../../monitor_identity.public monitor_identity.public +cp ../../monitor_identity.secret monitor_identity.secret + +docker build --tag="$test_name" -f netcon_dockerfile . +docker build --tag="$test_name"_monitor -f monitor_dockerfile . + +rm -f zerotier-one +rm -f zerotier-cli +rm -f zerotier-intercept +rm -f libzerotierintercept.so.1.0 +rm -f liblwip.so +rm -f netcon_identity.public +rm -f netcon_identity.secret +rm -f monitor_identity.public +rm -f monitor_identity.secret +rm -f *.conf +rm -f *.name + +# Start netcon container to be tested +test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest) +monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest) + +echo "waiting $netcon_test_wait_time for test to complete." +sleep $netcon_test_wait_time +docker kill $(docker ps -a -q) +docker rm $test_container +docker rm $monitor_container \ No newline at end of file diff --git a/netcon/docker-test/test.sh b/netcon/docker-test/test.sh index 6f69e3bf..9f232ca8 100755 --- a/netcon/docker-test/test.sh +++ b/netcon/docker-test/test.sh @@ -1,42 +1,21 @@ #./build.sh -# Relative paths are used in each test script, hence the need to change directories - -# --- httpd -cd httpd - -cd httpd-2.4.16-1.fc23.x86_64 -./test.sh -cd .. - -cd httpd-2.4.17-3.fc23.x86_64 -./test.sh -cd ../../ - - -# --- nginx -cd nginx - -cd nginx-1.8.0-13.fc23.x86_64 -./test.sh -cd .. - -cd nginx-1.8.0-14.fc23.x86_64 -./test.sh -cd ../../ - - -# --- redis -cd redis - -cd redis-3.0.4-1.fc23.x86_64 -./test.sh -cd ../../ - - -# --- node.js -cd nodejs - -cd nodejs-0.10.36-4.fc23 -./test.sh -cd ../../ \ No newline at end of file +# Remove previous test results +rm _results/*.txt + +# How long we shall wait for each test to conclude +export netcon_test_wait_time=45s + +# Test structure, in later releases more complex multi-party scripts will be included +export testscript=two_party_test.sh + +# Iterate over all depth=2 (relatively-speaking) directories and perform each test +find . -mindepth 2 -maxdepth 2 -type d | while read testdir; do + echo "*** Testing: '$testdir'..." + rm _results/*.tmp + cp $testscript $testdir/$testscript + cd $testdir + ./$testscript + rm $testscript + cd ../../ +done \ No newline at end of file diff --git a/netcon/docker-test/two_party_test.sh b/netcon/docker-test/two_party_test.sh new file mode 100755 index 00000000..b054b34b --- /dev/null +++ b/netcon/docker-test/two_party_test.sh @@ -0,0 +1,41 @@ + +test_name=${PWD##*/} +echo 'Building dockerfiles for test: ' "$test_name" +touch "$test_name".name + +# Docker won't allow the inclusion of files outside of the build directory +cp ../../*.conf . +cp ../../zerotier-one zerotier-one +cp ../../zerotier-cli zerotier-cli +cp ../../zerotier-intercept zerotier-intercept +cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0 +cp ../../liblwip.so liblwip.so +cp ../../netcon_identity.public netcon_identity.public +cp ../../netcon_identity.secret netcon_identity.secret +cp ../../monitor_identity.public monitor_identity.public +cp ../../monitor_identity.secret monitor_identity.secret + +docker build --tag="$test_name" -f netcon_dockerfile . +docker build --tag="$test_name"_monitor -f monitor_dockerfile . + +rm -f zerotier-one +rm -f zerotier-cli +rm -f zerotier-intercept +rm -f libzerotierintercept.so.1.0 +rm -f liblwip.so +rm -f netcon_identity.public +rm -f netcon_identity.secret +rm -f monitor_identity.public +rm -f monitor_identity.secret +rm -f *.conf +rm -f *.name + +# Start netcon container to be tested +test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest) +monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest) + +echo "waiting $netcon_test_wait_time for test to complete." +sleep $netcon_test_wait_time +docker kill $(docker ps -a -q) +docker rm $test_container +docker rm $monitor_container \ No newline at end of file -- cgit v1.2.3