diff options
Diffstat (limited to 'netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile')
| -rw-r--r-- | netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile index 1888071e..d89c4711 100644 --- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile +++ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile @@ -9,6 +9,14 @@ RUN yum clean all EXPOSE 9993/udp 80/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 / @@ -35,5 +35,7 @@ ADD zerotier-cli / ADD netcon_entrypoint.sh /netcon_entrypoint.sh RUN chmod -v +x /netcon_entrypoint.sh +ADD nginx.conf / + # Start ZeroTier-One CMD ["./netcon_entrypoint.sh"] |