diff options
Diffstat (limited to 'netcon/docker-test/sshd')
5 files changed, 14 insertions, 14 deletions
diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile index e8f803cd..d2d2a0cb 100644 --- a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile +++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_dockerfile @@ -4,9 +4,6 @@ MAINTAINER https://www.zerotier.com/ EXPOSE 9993/udp -# Install LWIP library used by service -ADD liblwip.so /var/lib/zerotier-one/liblwip.so - # Add ZT files RUN mkdir -p /var/lib/zerotier-one/networks.d ADD monitor_identity.public /var/lib/zerotier-one/identity.public @@ -14,6 +11,10 @@ ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret ADD *.conf /var/lib/zerotier-one/networks.d/ ADD *.conf / ADD *.name / + +# Install LWIP library used by service +ADD liblwip.so /var/lib/zerotier-one/liblwip.so + ADD zerotier-one / ADD zerotier-cli / diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh index d617bd4a..0756bc6a 100644 --- a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh +++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh @@ -43,7 +43,7 @@ echo '*** Copying file to intercepted server at' $ncvirtip touch "$bigfile_name" # Check md5 -md5sum < "$bigfile_name" >> "$rx_md5sumfile" +md5sum < "$bigfile_name" > "$rx_md5sumfile" tx_md5sum=$(<$tx_md5sumfile) # ... diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile index ddb0a6c4..e64c72bb 100644 --- a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile +++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile @@ -9,6 +9,14 @@ RUN yum clean all EXPOSE 9993/udp +# Add ZT files +RUN mkdir -p /var/lib/zerotier-one/networks.d +ADD netcon_identity.public /var/lib/zerotier-one/identity.public +ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret +ADD *.conf /var/lib/zerotier-one/networks.d/ +ADD *.conf / +ADD *.name / + # Install LWIP library used by service ADD liblwip.so /var/lib/zerotier-one/liblwip.so @@ -20,14 +28,6 @@ RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0 RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept RUN /usr/bin/install -c zerotier-intercept /usr/bin -# Add ZT files -RUN mkdir -p /var/lib/zerotier-one/networks.d -ADD netcon_identity.public /var/lib/zerotier-one/identity.public -ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret -ADD *.conf /var/lib/zerotier-one/networks.d/ -ADD *.conf / -ADD *.name / - ADD zerotier-one / ADD zerotier-cli / diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh index 9d8625aa..b52b9f69 100644 --- a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh @@ -38,8 +38,7 @@ export ZT_NC_NWID=$dev # Generate large random file for transfer test, share md5sum for monitor container to check echo '*** Generating ' "$bigfile_size" ' file' dd if=/dev/urandom of=/var/www/html/"$bigfile_name" bs="$bigfile_size" count=1 -#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile" -md5sum < /var/www/html/"$bigfile_name" >> "$tx_md5sumfile" +md5sum < /var/www/html/"$bigfile_name" > "$tx_md5sumfile" echo '*** Wrote MD5 sum to ' "$tx_md5sumfile" echo '*** Starting application...' diff --git a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/openssh-server-7.1p1-3.fc23.x86_64.name b/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/openssh-server-7.1p1-3.fc23.x86_64.name deleted file mode 100644 index e69de29b..00000000 --- a/netcon/docker-test/sshd/openssh-server-7.1p1-3.fc23.x86_64/openssh-server-7.1p1-3.fc23.x86_64.name +++ /dev/null |