diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-08 15:15:44 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-08 15:15:44 -0800 |
| commit | c2c37f3a63d0273fb2634acaa4f23e050684e689 (patch) | |
| tree | 93c91a69644efc64eaa217c6b6332697b8be1a71 /netcon/docker-test/nodejs | |
| parent | 0df33485ca573a33477eb8b076c8ca8c41e6a557 (diff) | |
| parent | b1eb16d5fb785872bfc38121edb78a785b58206f (diff) | |
| download | infinitytier-c2c37f3a63d0273fb2634acaa4f23e050684e689.tar.gz infinitytier-c2c37f3a63d0273fb2634acaa4f23e050684e689.zip | |
Merge with fixes of netcon to edge.
Diffstat (limited to 'netcon/docker-test/nodejs')
| -rw-r--r-- | netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile | 8 | ||||
| -rw-r--r-- | netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile index 1e7e10ad..b8f9fa78 100644 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile +++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile @@ -25,14 +25,14 @@ ADD httpserver.js / # Install syscall intercept library ADD zerotier-intercept / -ADD libzerotierintercept.so.1.0 / -RUN cp libzerotierintercept.so.1.0 lib/libzerotierintercept.so.1.0 -RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0 -RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept +ADD libzerotierintercept.so / +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 / # Install test scripts ADD netcon_entrypoint.sh /netcon_entrypoint.sh diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh index a6e1b6c1..324ebc8a 100644 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh +++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh @@ -18,7 +18,7 @@ address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host an echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one -su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' +su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1' virtip4="" while [ -z "$virtip4" ]; do sleep 0.2 |