github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 05:43:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Cleaned up, tests updated, readme updated

Browse source
This commit is contained in:
Joseph Henry 2015-12-15 14:50:54 -08:00
commit 9dc59eff76
17 changed files with 25 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

1
netcon/docker-test/_build_single_image.sh
View file

@ -20,7 +20,6 @@ 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-netcon-service
rm -f zerotier-intercept

7
netcon/docker-test/build_zt.sh
View file

@ -4,14 +4,11 @@
# copies the binaries into the test directory.
cd ../../
make clean
make netcon
make one
make netcon
cd netcon/docker-test
cp ../../zerotier-one zerotier-one
cp ../../zerotier-cli zerotier-cli
cp ../../zerotier-netcon-service zerotier-netcon-service
cp ../../libzerotierintercept.so libzerotierintercept.so
@ -19,3 +16,5 @@ cp ../../libzerotierintercept.so libzerotierintercept.so
cp ../liblwip.so liblwip.so
cp ../zerotier-intercept zerotier-intercept
cp ../../zerotier-one zerotier-one

1
netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
View file

@ -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 /

1
netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile
View file

@ -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 /

1
netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_dockerfile
View file

@ -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 /

1
netcon/docker-test/httpd/httpd_demo/netcon_dockerfile
View file

@ -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

1
netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile
View file

@ -30,7 +30,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 /

1
netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
View file

@ -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 /

1
netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
View file

@ -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 /

1
netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
View file

@ -30,7 +30,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 /

1
netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
View file

@ -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 /

1
netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
View file

@ -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 /
# Install test scripts