From b4624237af4d8ac5a1c67bcccad10d326c7f1605 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 28 Sep 2015 22:14:32 -0700 Subject: [PATCH] . --- docker-test/entrypoint.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docker-test/entrypoint.sh b/docker-test/entrypoint.sh index 129dbb3f8..93cfd9c66 100644 --- a/docker-test/entrypoint.sh +++ b/docker-test/entrypoint.sh @@ -11,6 +11,7 @@ echo '*** Starting ZeroTier network container host...' chown -R daemon /var/lib/zerotier-one chgrp -R daemon /var/lib/zerotier-one su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1' +#/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1 echo '*** Waiting for initial identity generation...' @@ -34,10 +35,6 @@ done echo '*** Starting Apache...' -sleep 0.5 -rm -rf /run/httpd/* /tmp/httpd* -intercept /usr/sbin/httpd -D FOREGROUND >>/tmp/apache.out 2>&1 & - echo '***' echo '*** Up and running at' $virtip4 '-- join network 8056c2e21c000001 and try:' echo '*** > ping' $virtip4 @@ -50,6 +47,10 @@ echo '***' echo '*** Follow https://www.zerotier.com/blog for news and release announcements!' echo '***' -while /bin/true; do - sleep 1000000 -done +#while /bin/true; do +# sleep 1000000 +#done + +sleep 0.5 +rm -rf /run/httpd/* /tmp/httpd* +intercept /usr/sbin/httpd -D FOREGROUND >>/tmp/apache.out 2>&1