diff options
Diffstat (limited to 'docker-test/Dockerfile')
| -rw-r--r-- | docker-test/Dockerfile | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile index d8152858..e25b7175 100644 --- a/docker-test/Dockerfile +++ b/docker-test/Dockerfile @@ -5,6 +5,7 @@ MAINTAINER https://www.zerotier.com/ # Add files ADD zerotier-one / +ADD zerotier-cli / ADD intercept / ADD lib/libintercept.so.1.0 / ADD lib/liblwip.so / @@ -18,23 +19,16 @@ RUN ln -sf /lib/libintercept.so.1.0 /lib/libintercept RUN /usr/bin/install -c intercept /usr/bin # Install Apache -#RUN yum -y update && yum clean all -#RUN yum -y install httpd && yum clean all -#RUN echo "Apache" >> /var/www/html/index.html +RUN yum -y update && yum clean all +RUN yum -y install httpd && yum clean all +RUN echo "Apache" >> /var/www/html/index.html EXPOSE 9993/udp # Start ZeroTier-One RUN mkdir -p /var/lib/zerotier-one/networks.d RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf -#ENTRYPOINT ["./entrypoint.sh"] -CMD ["./zerotier-one", "-U -p9993"] - - +RUN ./zerotier-one -d -U -p9993 -#ADD run-apache.sh /run-apache.sh -#RUN chmod -v +x /run-apache.sh -#CMD ["/run-apache.sh"] - -ADD zerotier-cli / -#RUN sleep 10 -#RUN ./zerotier-cli listnetworks +ADD entrypoint.sh /entrypoint.sh +RUN chmod -v +x /entrypoint.sh +CMD ["/entrypoint.sh"] |