summaryrefslogtreecommitdiff
path: root/docker-test/httpd_demo/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'docker-test/httpd_demo/Dockerfile')
-rw-r--r--docker-test/httpd_demo/Dockerfile20
1 files changed, 9 insertions, 11 deletions
diff --git a/docker-test/httpd_demo/Dockerfile b/docker-test/httpd_demo/Dockerfile
index a5de2140..6e1e5a78 100644
--- a/docker-test/httpd_demo/Dockerfile
+++ b/docker-test/httpd_demo/Dockerfile
@@ -1,6 +1,5 @@
# A basic harnessed application example using ZeroTier-One and user-space IP stack
-FROM fedora:20
-
+FROM fedora:23
MAINTAINER https://www.zerotier.com/
# Install Apache
@@ -8,32 +7,31 @@ RUN yum -y update && yum clean all
RUN yum -y install httpd && yum clean all
# Add files
-ADD zerotier-one /
-ADD zerotier-cli /
-ADD intercept /
-ADD lib/libintercept.so.1.0 /
-ADD lib/liblwip.so /
ADD htdocs/index.html /
ADD htdocs/ZeroTierIcon.png /
-RUN cp libintercept.so.1.0 lib/libintercept.so.1.0
-RUN cp liblwip.so lib/liblwip.so
+
# Install sys-call intercept library
+ADD zerotier-one /
+ADD zerotier-cli /
+ADD intercept /
+ADD libintercept.so.1.0 /
+ADD liblwip.so /
+RUN cp liblwip.so lib/liblwip.so
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
+
RUN echo "Apache" >> /var/www/html/index.html
EXPOSE 9993/udp
-
RUN mv index.html /var/www/html/index.html
RUN mv ZeroTierIcon.png /var/www/html/ZeroTierIcon.png
# Start ZeroTier-One
RUN mkdir -p /var/lib/zerotier-one/networks.d
RUN touch /var/lib/zerotier-one/networks.d/8056c2e21c000001.conf
-
ADD entrypoint.sh /entrypoint.sh
RUN chmod -v +x /entrypoint.sh
CMD ["./entrypoint.sh"]