diff options
| author | Joseph Henry <joseph.henry@zerotier.com> | 2015-09-28 17:30:18 -0400 |
|---|---|---|
| committer | Joseph Henry <joseph.henry@zerotier.com> | 2015-09-28 17:30:18 -0400 |
| commit | 77b385fb1284f6386249adf4cd8fc3efcc0601df (patch) | |
| tree | f2275bb0fc0bc2931bac397a626e5d1596e3de83 /docker-test | |
| parent | 0b34d8e75e293a461fb66bb3c177e4995b45ed07 (diff) | |
| download | infinitytier-77b385fb1284f6386249adf4cd8fc3efcc0601df.tar.gz infinitytier-77b385fb1284f6386249adf4cd8fc3efcc0601df.zip | |
Re-added Apache to Dockerfile
Diffstat (limited to 'docker-test')
| -rw-r--r-- | docker-test/Dockerfile | 22 | ||||
| -rw-r--r-- | docker-test/entrypoint.sh | 4 | ||||
| -rw-r--r-- | docker-test/run-apache.sh | 8 | ||||
| -rwxr-xr-x | docker-test/zerotier-one | bin | 5635672 -> 5635680 bytes |
4 files changed, 11 insertions, 23 deletions
diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile index d8152858..e25b7175 100644 --- a/docker-test/Dockerfile +++ b/docker-test/Dockerfile @@ -5,6 +5,7 @@ MAINTAINER https://www.zerotier.com/ # Add files ADD zerotier-one / +ADD zerotier-cli / ADD intercept / ADD lib/libintercept.so.1.0 / ADD lib/liblwip.so / @@ -18,23 +19,16 @@ 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 # Start ZeroTier-One RUN mkdir -p /var/lib/zerotier-one/networks.d RUN touch /var/lib/zerotier-one/networks.d/e5cd7a9e1c5311ab.conf -#ENTRYPOINT ["./entrypoint.sh"] -CMD ["./zerotier-one", "-U -p9993"] - - +RUN ./zerotier-one -d -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 +ADD entrypoint.sh /entrypoint.sh +RUN chmod -v +x /entrypoint.sh +CMD ["/entrypoint.sh"] diff --git a/docker-test/entrypoint.sh b/docker-test/entrypoint.sh index da537c27..a4294ce0 100644 --- a/docker-test/entrypoint.sh +++ b/docker-test/entrypoint.sh @@ -1,3 +1,5 @@ #!/bin/bash -#exec ./zerotier-one -U -p9993 FOREGROUND +rm -rf /run/httpd/* /tmp/httpd* + +exec /usr/sbin/httpd -D FOREGROUND diff --git a/docker-test/run-apache.sh b/docker-test/run-apache.sh deleted file mode 100644 index 5af3cc30..00000000 --- a/docker-test/run-apache.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# Make sure we're not confused by old, incompletely-shutdown httpd -# context after restarting the container. httpd won't start correctly -# if it thinks it is already running. -rm -rf /run/httpd/* /tmp/httpd* - -exec /usr/sbin/httpd -D FOREGROUND diff --git a/docker-test/zerotier-one b/docker-test/zerotier-one Binary files differindex ab43d9a4..3ba794b5 100755 --- a/docker-test/zerotier-one +++ b/docker-test/zerotier-one |