diff options
| author | Joseph Henry <joseph.henry@zerotier.com> | 2015-09-28 17:47:38 -0400 |
|---|---|---|
| committer | Joseph Henry <joseph.henry@zerotier.com> | 2015-09-28 17:47:38 -0400 |
| commit | 8e3e830e89da471ab941aa78194f5254d254899b (patch) | |
| tree | d44754fbb58698427438092077d4f4cc662f2b03 | |
| parent | 77b385fb1284f6386249adf4cd8fc3efcc0601df (diff) | |
| download | infinitytier-8e3e830e89da471ab941aa78194f5254d254899b.tar.gz infinitytier-8e3e830e89da471ab941aa78194f5254d254899b.zip | |
Working intercepted Apache
| -rw-r--r-- | docker-test/Dockerfile | 3 | ||||
| -rw-r--r-- | docker-test/entrypoint.sh | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker-test/Dockerfile b/docker-test/Dockerfile index e25b7175..83b33f89 100644 --- a/docker-test/Dockerfile +++ b/docker-test/Dockerfile @@ -27,8 +27,7 @@ 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 -RUN ./zerotier-one -d -U -p9993 ADD entrypoint.sh /entrypoint.sh RUN chmod -v +x /entrypoint.sh -CMD ["/entrypoint.sh"] +CMD ["./entrypoint.sh"] diff --git a/docker-test/entrypoint.sh b/docker-test/entrypoint.sh index a4294ce0..8b8bebf4 100644 --- a/docker-test/entrypoint.sh +++ b/docker-test/entrypoint.sh @@ -1,5 +1,6 @@ #!/bin/bash -rm -rf /run/httpd/* /tmp/httpd* +./zerotier-one -d -U -p9993 -exec /usr/sbin/httpd -D FOREGROUND +rm -rf /run/httpd/* /tmp/httpd* +exec intercept /usr/sbin/httpd -D FOREGROUND |