diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-11-12 14:18:15 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-11-12 14:18:15 +0100 |
| commit | ff504029432852faef500497fc586f8fdc46bf37 (patch) | |
| tree | c8d8ec4a258f4217e8b90224c5f8f680438ee651 | |
| parent | 627003ae120a09b0e72940eb3683132a4a0cf93f (diff) | |
Add docker packaging.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | packaging/docker/Dockerfile | 13 | ||||
| -rw-r--r-- | packaging/docker/Makefile | 2 | ||||
| -rwxr-xr-x | packaging/docker/start.sh | 5 |
4 files changed, 22 insertions, 1 deletions
@@ -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 <linus@nordu.net> + +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 |