From ff504029432852faef500497fc586f8fdc46bf37 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 12 Nov 2015 14:18:15 +0100 Subject: Add docker packaging. --- Makefile | 3 ++- packaging/docker/Dockerfile | 13 +++++++++++++ packaging/docker/Makefile | 2 ++ packaging/docker/start.sh | 5 +++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 packaging/docker/Dockerfile create mode 100644 packaging/docker/Makefile create mode 100755 packaging/docker/start.sh diff --git a/Makefile b/Makefile index a8c1306..0821f85 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,8 @@ all: --plugin=sidebar \ --exclude=html \ --include=^doc/.*/.*\.html \ - --exclude=Makefile + --exclude=Makefile \ + --exclude=packaging clean: rm -rf .ikiwiki html diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile new file mode 100644 index 0000000..da07384 --- /dev/null +++ b/packaging/docker/Dockerfile @@ -0,0 +1,13 @@ +# lighttpd + ikiwiki +FROM ubuntu:14.04 +MAINTAINER Linus Nordberg + +RUN apt-get update +RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections +RUN apt-get -y -q install lighttpd ikiwiki make + +EXPOSE 80 +EXPOSE 443 +VOLUME /etc/lighttpd +ADD start.sh / +ENTRYPOINT ["/start.sh"] diff --git a/packaging/docker/Makefile b/packaging/docker/Makefile new file mode 100644 index 0000000..8dca7b0 --- /dev/null +++ b/packaging/docker/Makefile @@ -0,0 +1,2 @@ +all: + docker build -t ikiwiki . diff --git a/packaging/docker/start.sh b/packaging/docker/start.sh new file mode 100755 index 0000000..f518ca9 --- /dev/null +++ b/packaging/docker/start.sh @@ -0,0 +1,5 @@ +#! /bin/sh +if [ -f /var/www/Makefile ]; then + make -C /var/www +fi +/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf -- cgit v1.1