diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-04 15:41:56 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-04 15:41:56 -0800 |
| commit | 0df33485ca573a33477eb8b076c8ca8c41e6a557 (patch) | |
| tree | f04939809906abb25f5393033127308e39cd5b64 /netcon/docker-test/nodejs | |
| parent | 3869d6257b225f32cf3ae1caeb523a0d69824eef (diff) | |
| parent | 7ea53dd21b320cc94077444ec18f8482f5b5cd19 (diff) | |
| download | infinitytier-0df33485ca573a33477eb8b076c8ca8c41e6a557.tar.gz infinitytier-0df33485ca573a33477eb8b076c8ca8c41e6a557.zip | |
Merge remote-tracking branch 'origin/netcon' into edge
Diffstat (limited to 'netcon/docker-test/nodejs')
3 files changed, 12 insertions, 11 deletions
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile index e8f803cd..d2d2a0cb 100644 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile +++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/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/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile index ea2abd68..1e7e10ad 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 @@ -9,6 +9,14 @@ RUN yum clean all EXPOSE 9993/udp 8080/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 @@ -23,14 +31,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/nodejs/nodejs-0.10.36-4.fc23/nodejs-0.10.36-4.fc23.name b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/nodejs-0.10.36-4.fc23.name deleted file mode 100644 index e69de29b..00000000 --- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/nodejs-0.10.36-4.fc23.name +++ /dev/null |