diff options
| author | Joseph Henry <joseph.henry@zerotier.com> | 2015-09-28 16:56:14 -0400 |
|---|---|---|
| committer | Joseph Henry <joseph.henry@zerotier.com> | 2015-09-28 16:56:14 -0400 |
| commit | 0b34d8e75e293a461fb66bb3c177e4995b45ed07 (patch) | |
| tree | 9fdc870302af0c4f8f7ce0234dc84f739393c528 /docker-test | |
| parent | 0c3dd2be961400910eeccebaaabba61a7f3993bd (diff) | |
| download | infinitytier-0b34d8e75e293a461fb66bb3c177e4995b45ed07.tar.gz infinitytier-0b34d8e75e293a461fb66bb3c177e4995b45ed07.zip | |
New Dockerfile
Diffstat (limited to 'docker-test')
| -rw-r--r-- | docker-test/Dockerfile | 26 | ||||
| -rw-r--r-- | docker-test/entrypoint.sh | 3 | ||||
| l--------- | docker-test/zerotier-cli | 1 |
3 files changed, 21 insertions, 9 deletions
diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile index 184faed4..d8152858 100644 --- a/docker-test/Dockerfile +++ b/docker-test/Dockerfile @@ -9,24 +9,32 @@ ADD intercept / ADD lib/libintercept.so.1.0 / ADD lib/liblwip.so / +RUN cp libintercept.so.1.0 lib/libintercept.so.1.0 +RUN cp liblwip.so lib/liblwip.so + # Install sys-call intercept library RUN cp libintercept.so.1.0 /lib/libintercept.so.1.0 RUN ln -sf /lib/libintercept.so.1.0 /lib/libintercept RUN /usr/bin/install -c intercept /usr/bin # Install Apache -RUN yum -y update && yum clean all -RUN yum -y install httpd && yum clean all -RUN echo "Apache" >> /var/www/html/index.html +#RUN yum -y update && yum clean all +#RUN yum -y install httpd && yum clean all +#RUN echo "Apache" >> /var/www/html/index.html EXPOSE 9993/udp -# Simple startup script to avoid some issues observed with container restart -ADD run-apache.sh /run-apache.sh -RUN chmod -v +x /run-apache.sh -CMD ["/run-apache.sh"] - # Start ZeroTier-One RUN mkdir -p /var/lib/zerotier-one/networks.d RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf -RUN ./zerotier-one -d -U -p9993 /root/dev/ztest +#ENTRYPOINT ["./entrypoint.sh"] +CMD ["./zerotier-one", "-U -p9993"] + + + +#ADD run-apache.sh /run-apache.sh +#RUN chmod -v +x /run-apache.sh +#CMD ["/run-apache.sh"] +ADD zerotier-cli / +#RUN sleep 10 +#RUN ./zerotier-cli listnetworks diff --git a/docker-test/entrypoint.sh b/docker-test/entrypoint.sh new file mode 100644 index 00000000..da537c27 --- /dev/null +++ b/docker-test/entrypoint.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +#exec ./zerotier-one -U -p9993 FOREGROUND diff --git a/docker-test/zerotier-cli b/docker-test/zerotier-cli new file mode 120000 index 00000000..e909e08e --- /dev/null +++ b/docker-test/zerotier-cli @@ -0,0 +1 @@ +zerotier-one
\ No newline at end of file |