diff options
| author | Joseph Henry <joseph.henry@gmail.com> | 2015-11-04 14:45:26 -0800 |
|---|---|---|
| committer | Joseph Henry <joseph.henry@gmail.com> | 2015-11-04 14:45:26 -0800 |
| commit | 3e84e8b8c3bf28ff8299d1c188d60aa030f9c2c3 (patch) | |
| tree | e64cf46318822a0f462c60167781748bedfa457e /docker-test | |
| parent | 4b079872102da8ba482cf0868294d761729b24fe (diff) | |
| download | infinitytier-3e84e8b8c3bf28ff8299d1c188d60aa030f9c2c3.tar.gz infinitytier-3e84e8b8c3bf28ff8299d1c188d60aa030f9c2c3.zip | |
Performance tweaks to lwipopts.h (TX=12MB/s)
Diffstat (limited to 'docker-test')
| -rw-r--r-- | docker-test/throughput-test/Dockerfile | 20 | ||||
| -rwxr-xr-x | docker-test/throughput-test/build.sh | 1 | ||||
| l--------- | docker-test/zerotier-cli | 1 | ||||
| -rwxr-xr-x | docker-test/zerotier-one | bin | 5635680 -> 0 bytes |
4 files changed, 12 insertions, 10 deletions
diff --git a/docker-test/throughput-test/Dockerfile b/docker-test/throughput-test/Dockerfile index b98def3e..b350007f 100644 --- a/docker-test/throughput-test/Dockerfile +++ b/docker-test/throughput-test/Dockerfile @@ -2,18 +2,14 @@ FROM fedora:22 MAINTAINER https://www.zerotier.com/ -# Install Apache -RUN yum -y update && yum clean all -RUN yum -y install httpd && yum clean all +# Install apps +RUN yum -y update +RUN yum -y install httpd +RUN yum -y install nano +RUN yum clean all EXPOSE 9993/udp 9992/udp 9991/udp 9990/udp -# Add ZT files -RUN mkdir -p /var/lib/zerotier-one/networks.d -RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf -ADD zerotier-one / -ADD zerotier-cli / - # Install sys-call intercept library ADD intercept / ADD libintercept.so.1.0 / @@ -22,6 +18,12 @@ RUN cp libintercept.so.1.0 /lib/libintercept.so.1.0 RUN ln -sf /lib/libintercept.so.1.0 /lib/libintercept RUN /usr/bin/install -c intercept /usr/bin +# Add ZT files +RUN mkdir -p /var/lib/zerotier-one/networks.d +RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf +ADD zerotier-one / +ADD zerotier-cli / + # Install test-setup scripts ADD generate_file.sh /generate_file.sh RUN chmod -v +x /generate_file.sh diff --git a/docker-test/throughput-test/build.sh b/docker-test/throughput-test/build.sh index 290053d9..586c8931 100755 --- a/docker-test/throughput-test/build.sh +++ b/docker-test/throughput-test/build.sh @@ -1,4 +1,5 @@ cd ../../ +make clean make cd netcon make -f make-intercept.mk lib diff --git a/docker-test/zerotier-cli b/docker-test/zerotier-cli deleted file mode 120000 index e909e08e..00000000 --- a/docker-test/zerotier-cli +++ /dev/null @@ -1 +0,0 @@ -zerotier-one
\ No newline at end of file diff --git a/docker-test/zerotier-one b/docker-test/zerotier-one Binary files differdeleted file mode 100755 index 372bed32..00000000 --- a/docker-test/zerotier-one +++ /dev/null |
