Browse Source

Working intercepted Apache

Joseph Henry 10 years ago
parent
commit
8e3e830e89
2 changed files with 4 additions and 4 deletions
  1. 1 2
      docker-test/Dockerfile
  2. 3 2
      docker-test/entrypoint.sh

+ 1 - 2
docker-test/Dockerfile

@@ -27,8 +27,7 @@ EXPOSE 9993/udp
 # Start ZeroTier-One
 # Start ZeroTier-One
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf
 RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf
-RUN ./zerotier-one -d -U -p9993
 
 
 ADD entrypoint.sh /entrypoint.sh
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod -v +x /entrypoint.sh
 RUN chmod -v +x /entrypoint.sh
-CMD ["/entrypoint.sh"]
+CMD ["./entrypoint.sh"]

+ 3 - 2
docker-test/entrypoint.sh

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