Browse Source

New Dockerfile

Joseph Henry 10 years ago
parent
commit
0b34d8e75e
3 changed files with 21 additions and 9 deletions
  1. 17 9
      docker-test/Dockerfile
  2. 3 0
      docker-test/entrypoint.sh
  3. 1 0
      docker-test/zerotier-cli

+ 17 - 9
docker-test/Dockerfile

@@ -9,24 +9,32 @@ ADD intercept /
 ADD lib/libintercept.so.1.0 /
 ADD lib/liblwip.so /
 
+RUN cp libintercept.so.1.0 lib/libintercept.so.1.0
+RUN cp liblwip.so lib/liblwip.so
+
 # Install sys-call intercept library
 RUN cp libintercept.so.1.0 /lib/libintercept.so.1.0
 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
 
-# Simple startup script to avoid some issues observed with container restart 
-ADD run-apache.sh /run-apache.sh
-RUN chmod -v +x /run-apache.sh
-CMD ["/run-apache.sh"]
-
 # Start ZeroTier-One
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf
-RUN ./zerotier-one -d -U -p9993 /root/dev/ztest
+#ENTRYPOINT ["./entrypoint.sh"]
+CMD ["./zerotier-one", "-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

+ 3 - 0
docker-test/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+#exec ./zerotier-one -U -p9993 FOREGROUND

+ 1 - 0
docker-test/zerotier-cli

@@ -0,0 +1 @@
+zerotier-one