3 files changed, 4 insertions, 22 deletions
diff --git a/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile b/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile
index be9d3f3f..a193863f 100644
--- a/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile
+++ b/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile
@@ -17,10 +17,9 @@ RUN mv ZeroTierIcon.png /var/www/html/ZeroTierIcon.png
 
 # 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
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
 # Add ZT files
diff --git a/netcon/docker-test/httpd/httpd_demo/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd_demo/netcon_entrypoint.sh
index fd47cf38..5c42b6a6 100644
--- a/netcon/docker-test/httpd/httpd_demo/netcon_entrypoint.sh
+++ b/netcon/docker-test/httpd/httpd_demo/netcon_entrypoint.sh
@@ -51,4 +51,4 @@ echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
 echo '*** Starting application...'
 sleep 0.5
 rm -rf /run/httpd/* /tmp/httpd*
-zerotier-intercept /usr/sbin/httpd -D FOREGROUND >>/tmp/apache.out 2>&1
+zerotier-intercept /usr/sbin/httpd -X
diff --git a/netcon/docker-test/httpd/httpd_demo/two_party_test.sh b/netcon/docker-test/httpd/httpd_demo/two_party_test.sh
deleted file mode 100755
index 164b0b2e..00000000
--- a/netcon/docker-test/httpd/httpd_demo/two_party_test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Runs test image and monitor image as daemons
-
-test_name=${PWD##*/}
-echo 'Building dockerfiles for test: ' "$test_name"
-touch "$test_name".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 stop $(docker ps -a -q)
-docker rm $test_container
-docker rm $monitor_container
-\ No newline at end of file