diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-12-04 09:28:06 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-12-04 09:28:06 +0100 |
| commit | ba8eab1755ec0f780bfb505224f562b9da0990d8 (patch) | |
| tree | 6dd08038db2899d7b98de3fb2ab7c84e3b217010 | |
| parent | 293cbde41aed70c89f26b5b2497f31ca1dc4d2f4 (diff) | |
Abandon the "data container" idea.
Decouple from ndn web, generate html in ./html.
Expected usage is now
docker run -v /var/www/html/radsecproxy:/usr/local/src/radsecproxy-web/html IMAGE
and have a web server use /var/www/html/.
| -rw-r--r-- | packaging/docker/Dockerfile | 14 | ||||
| -rwxr-xr-x | packaging/docker/mkhtml.sh | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 921eb99..d598235 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,18 +1,9 @@ # radsecproxy-web # -# Generates static HTML from an ikiwiki git repo. +# Generates static HTML from an ikiwiki git repo and exits. # -# Run as a "data volume container" (`docker run --name radsecproxy-web -# IMAGE') used by another container running a web server (`docker run -# -d --volumes-from radsecproxy-web --name my_web -# web_software_ndn). Note that the radsecproxy-web container will show -# in `docker ps -a' with status `Exited (0)'. It still exports -# /var/www/radsecproxy to the my_web container. Note that it must be -# 'run' and not merely 'create':d since mkhtml.sh needs to generate -# the HTML files. - -FROM web_software_ndn +FROM debian:latest MAINTAINER Linus Nordberg <linus+radsecproxy@nordu.net> RUN apt-get update @@ -22,6 +13,5 @@ RUN apt-get -y -q install ikiwiki make RUN [ -d /usr/local/src/radsecproxy-web ] || git clone https://git.nordu.net/radsecproxy-web.git /usr/local/src/radsecproxy-web RUN cd /usr/local/src/radsecproxy-web && git pull -VOLUME /var/www/html/radsecproxy ADD mkhtml.sh / ENTRYPOINT ["/mkhtml.sh"] diff --git a/packaging/docker/mkhtml.sh b/packaging/docker/mkhtml.sh index a32700d..48e3bb5 100755 --- a/packaging/docker/mkhtml.sh +++ b/packaging/docker/mkhtml.sh @@ -1,6 +1,6 @@ #! /bin/sh -[ -z "$HTML_DESTDIR" ] && HTML_DESTDIR=/var/www/html/radsecproxy +[ -z "$HTML_DESTDIR" ] && HTML_DESTDIR=html if [ -f /usr/local/src/radsecproxy-web/Makefile ]; then make -C /usr/local/src/radsecproxy-web DESTDIR=$HTML_DESTDIR |