updated docker test files

This commit is contained in:
Joseph Henry
2016-07-06 17:54:09 -05:00
parent c2f009ce78
commit eb397a68c4
38 changed files with 65 additions and 498 deletions

View File

@@ -10,7 +10,7 @@ cp ../../zerotier-one zerotier-one
cp ../../zerotier-cli zerotier-cli
cp ../../zerotier-cli zerotier-sdk-service
cp ../../zerotier-intercept zerotier-intercept
cp ../../libzerotierintercept.so libzerotierintercept.so
cp ../../libztintercept.so libztintercept.so
cp ../../liblwip.so liblwip.so
cp ../../sdk_identity.public sdk_identity.public
cp ../../sdk_identity.secret sdk_identity.secret

View File

@@ -11,7 +11,7 @@ cd sdk/docker-test
cp ../../zerotier-cli zerotier-cli
cp ../../zerotier-sdk-service zerotier-sdk-service
cp ../../libzerotierintercept.so libzerotierintercept.so
cp ../../libztintercept.so libztintercept.so
cp ../liblwip.so liblwip.so
cp ../zerotier-intercept zerotier-intercept

View File

@@ -21,9 +21,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -42,5 +42,5 @@ echo '*** Starting application...'
sleep 0.5
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
darkhttpd /

View File

@@ -21,9 +21,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -43,5 +43,5 @@ sleep 0.5
rm -rf /run/httpd/* /tmp/httpd*
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
/usr/sbin/httpd -X

View File

@@ -22,9 +22,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -43,5 +43,5 @@ sleep 0.5
rm -rf /run/httpd/* /tmp/httpd*
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
/usr/sbin/httpd -X

View File

@@ -21,9 +21,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -45,5 +45,5 @@ sleep 0.5
rm -rf /run/httpd/* /tmp/httpd*
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
/usr/sbin/httpd -X

View File

@@ -16,8 +16,8 @@ RUN mv index.html /var/www/html/index.html
RUN mv ZeroTierIcon.png /var/www/html/ZeroTierIcon.png
# Install syscall intercept library
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
# Add ZT files
RUN mkdir -p /var/lib/zerotier-one/networks.d

View File

@@ -24,9 +24,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -46,5 +46,5 @@ echo '*** Starting application...'
sleep 0.5
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
nginx

View File

@@ -21,9 +21,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -46,5 +46,5 @@ echo '*** Starting application...'
sleep 0.5
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
nginx

View File

@@ -21,9 +21,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -46,5 +46,5 @@ echo '*** Starting application...'
sleep 0.5
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
nginx

View File

@@ -24,9 +24,9 @@ ADD liblwip.so /var/lib/zerotier-one/liblwip.so
ADD httpserver.js /
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -30,7 +30,7 @@ echo '*** Writing address to ' "$address_file"
echo $virtip4 > "$address_file"
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
# --- Test section ---
echo '*** Starting application...'

View File

@@ -21,9 +21,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -42,5 +42,5 @@ echo '*** Starting application...'
sleep 0.5
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
python -m SimpleHTTPServer 80

View File

@@ -20,9 +20,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
ADD zerotier-sdk-service /

View File

@@ -42,5 +42,5 @@ echo '*** Starting application...'
sleep 0.5
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
python3 -m http.server 80

View File

@@ -21,9 +21,9 @@ EXPOSE 9993/udp 6379/udp
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /
Add zerotier-sdk-service /

View File

@@ -34,5 +34,5 @@ echo '*** Starting application...'
sleep 0.5
export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
export LD_PRELOAD=./libzerotierintercept.so
export LD_PRELOAD=./libztintercept.so
/usr/bin/redis-server --port 6379

View File

@@ -21,9 +21,9 @@ ADD *.name /
ADD liblwip.so /var/lib/zerotier-one/liblwip.so
# Install syscall intercept library
ADD libzerotierintercept.so /
RUN cp libzerotierintercept.so lib/libzerotierintercept.so
RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
ADD libztintercept.so /
RUN cp libztintercept.so lib/libztintercept.so
RUN ln -sf /lib/libztintercept.so /lib/libzerotierintercept
ADD zerotier-cli /