Modified test scripts to match new naming conventions

This commit is contained in:
root 2015-12-07 03:21:46 -08:00
commit 036bbfaff9
23 changed files with 55 additions and 57 deletions

View file

@ -30,6 +30,7 @@ RUN /usr/bin/install -c zerotier-intercept /usr/bin
ADD zerotier-one /
ADD zerotier-cli /
ADD zerotier-netcon-service /
# Install test scripts
ADD netcon_entrypoint.sh /netcon_entrypoint.sh

View file

@ -18,9 +18,9 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
# --- Network Config ---
echo '*** ZeroTier Network Containers Test: ' "$test_name"
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'
chown -R daemon /var/lib/zerotier-netcon-service
chgrp -R daemon /var/lib/zerotier-netcon-service
su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
virtip4=""
while [ -z "$virtip4" ]; do
sleep 0.2

View file

@ -30,6 +30,7 @@ RUN /usr/bin/install -c zerotier-intercept /usr/bin
ADD zerotier-one /
ADD zerotier-cli /
ADD zerotier-netcon-service /
# Install test scripts
ADD netcon_entrypoint.sh /netcon_entrypoint.sh

View file

@ -19,9 +19,9 @@ tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
# --- Network Config ---
echo '*** ZeroTier Network Containers Test: ' "$test_name"
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'
chown -R daemon /var/lib/zerotier-netcon-service
chgrp -R daemon /var/lib/zerotier-netcon-service
su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
virtip4=""
while [ -z "$virtip4" ]; do
sleep 0.2