Working intercepted Apache

This commit is contained in:
Joseph Henry 2015-09-28 17:47:38 -04:00
parent 77b385fb12
commit 8e3e830e89
2 changed files with 4 additions and 4 deletions

View File

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

View File

@ -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