Re-added Apache to Dockerfile

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"]

docker-test/entrypoint.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-#exec ./zerotier-one -U -p9993 FOREGROUND
+rm -rf /run/httpd/* /tmp/httpd*
+
+exec /usr/sbin/httpd -D FOREGROUND

docker-test/run-apache.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Make sure we're not confused by old, incompletely-shutdown httpd
-# context after restarting the container.  httpd won't start correctly
-# if it thinks it is already running.
-rm -rf /run/httpd/* /tmp/httpd*
-
-exec /usr/sbin/httpd -D FOREGROUND