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

listnetworks/authtoken.secret

@@ -0,0 +1 @@
+5cqj90r3d3xsubfy4jx5mug6

listnetworks/identity.public

@@ -0,0 +1 @@
+3e3ffbb3e0:0:82ffe6f55da66c0dc6fc240869c4f23b560d7c9fa3681852ead859055e4aeb1c5d12da7337f53cd5d2ffbcb852bef5359d52abf9a8e1bf1906283913e01016f1

listnetworks/identity.secret

@@ -0,0 +1 @@
+3e3ffbb3e0:0:82ffe6f55da66c0dc6fc240869c4f23b560d7c9fa3681852ead859055e4aeb1c5d12da7337f53cd5d2ffbcb852bef5359d52abf9a8e1bf1906283913e01016f1:f4444bb7fc8f859d2efea6548531e7d2435174c942722aaa788fa3f90d431f5ad37cefe5343f7340b701999461dafed28a4144ae7c9af6752ad66153936115f7

listnetworks/zerotier-one.port

@@ -0,0 +1 @@
+9993

netcon/NetconEthernetTap.hpp

@@ -184,6 +184,7 @@ static err_t tapif_init(struct netif *netif)
 
 static err_t low_level_output(struct netif *netif, struct pbuf *p)
 {
+	fprintf(stderr, "low_level_output()\n");
   struct pbuf *q;
   char buf[ZT1_MAX_MTU+32];
   char *bufptr;