From 9dc59eff7634847b61cb3fa2d1d8b7a9d4915035 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 15 Dec 2015 14:50:54 -0800 Subject: Cleaned up, tests updated, readme updated --- netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile | 1 - netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile | 1 - netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile | 1 - netcon/docker-test/httpd/httpd_demo/netcon_dockerfile | 1 - 4 files changed, 4 deletions(-) (limited to 'netcon/docker-test/httpd') 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 f0c6260d..fe668fb7 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 @@ -27,7 +27,6 @@ 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 zerotier-one / ADD zerotier-cli / ADD zerotier-netcon-service / diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile index 8d9d1032..76b7b7dd 100644 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile +++ b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile @@ -28,7 +28,6 @@ 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 zerotier-one / ADD zerotier-cli / ADD zerotier-netcon-service / 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 d946e2fd..90739f10 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 @@ -27,7 +27,6 @@ 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 zerotier-one / ADD zerotier-cli / ADD zerotier-netcon-service / diff --git a/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile b/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile index a193863f..cf50e1d9 100644 --- a/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile +++ b/netcon/docker-test/httpd/httpd_demo/netcon_dockerfile @@ -30,7 +30,6 @@ ADD *.conf /var/lib/zerotier-one/networks.d/ ADD *.conf / ADD *.name / -ADD zerotier-one / ADD zerotier-cli / # Install test scripts -- cgit v1.2.3