ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-25 23:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More entry point work, and change network to 8056c2e21c000001 for demo.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-09-28 16:14:32 -07:00
parent 980d145f48
commit 3a6346f560
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-test/Dockerfile
View File

@ -27,7 +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/8056c2e21c000001.conf
ADD entrypoint.sh /entrypoint.sh ADD entrypoint.sh /entrypoint.sh
RUN chmod -v +x /entrypoint.sh RUN chmod -v +x /entrypoint.sh

33
docker-test/entrypoint.sh
View File

@ -8,7 +8,10 @@ echo '*** https://www.zerotier.com/'
echo '***' echo '***'
echo '*** Starting ZeroTier network container host...' echo '*** Starting ZeroTier network container host...'
/zerotier-one -d -U -p9993 >>/zerotier-one.out 2>&1 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'
echo '*** Waiting for initial identity generation...' echo '*** Waiting for initial identity generation...'
@ -21,20 +24,36 @@ cat /var/lib/zerotier-one/identity.public
echo '*** Waiting for network configuration...' echo '*** Waiting for network configuration...'
virtip4="" virtip4=""
while [ ! -s /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf ]; do while [ ! -s /var/lib/zerotier-one/networks.d/8056c2e21c000001.conf ]; do
sleep 0.5 sleep 0.5
done done
while [ -z "$virtip4" ]; do while [ -z "$virtip4" ]; do
virtip4=`/zerotier-cli listnetworks | grep -F e5cd7a9e1c5311ab | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1` virtip4=`/zerotier-cli listnetworks | grep -F 8056c2e21c000001 | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
done done
echo '*** Starting Apache...'
sleep 1
rm -rf /run/httpd/* /tmp/httpd*
intercept /usr/sbin/httpd >>/tmp/apache.out 2>&1
echo '***' echo '***'
echo '*** Up and running at ' $virtip4 ' -- join network e5cd7a9e1c5311ab and try:' echo '*** Up and running at' $virtip4 '-- join network 8056c2e21c000001 and try:'
echo '*** > ping ' $virtip4 echo '*** > ping' $virtip4
echo -n '*** > curl http://' echo -n '*** > curl http://'
echo -n $virtip4 echo -n $virtip4
echo '/' echo '/'
echo '***' echo '***'
echo "*** You might need to wait a minute or two."
echo '***'
echo '*** Look, no root!'
echo
ps aux
echo
echo '***'
echo '*** Follow https://www.zerotier.com/blog for news and release announcements!'
echo '***'
rm -rf /run/httpd/* /tmp/httpd* while /bin/true; do
exec intercept /usr/sbin/httpd -D FOREGROUND >>/apache.out 2>&1 sleep 1000000
done