summaryrefslogtreecommitdiff
path: root/netcon/docker-test/httpd
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2015-12-15 14:50:54 -0800
committerJoseph Henry <josephjah@gmail.com>2015-12-15 14:50:54 -0800
commit9dc59eff7634847b61cb3fa2d1d8b7a9d4915035 (patch)
tree459879838b5db33f3aecb359345969fc9f0b94db /netcon/docker-test/httpd
parenta6c5596782bf25c6563f97c5018efcb175079e2d (diff)
downloadinfinitytier-9dc59eff7634847b61cb3fa2d1d8b7a9d4915035.tar.gz
infinitytier-9dc59eff7634847b61cb3fa2d1d8b7a9d4915035.zip
Cleaned up, tests updated, readme updated
Diffstat (limited to 'netcon/docker-test/httpd')
-rw-r--r--netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile1
-rw-r--r--netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile1
-rw-r--r--netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile1
-rw-r--r--netcon/docker-test/httpd/httpd_demo/netcon_dockerfile1
4 files changed, 0 insertions, 4 deletions
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