From 43411bfd248d2a0db42bcece3a1b5dbb294432e7 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Tue, 1 Dec 2015 20:51:47 +0100
Subject: Rename start.sh --> mkhtml.sh

This is now supposed to run a "data volume container" and won't start
any long-running process but rather just generate HTML.
---
 packaging/docker/Dockerfile | 18 +++++++++++++-----
 packaging/docker/mkhtml.sh  |  8 ++++++++
 packaging/docker/start.sh   |  5 -----
 3 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100755 packaging/docker/mkhtml.sh
 delete mode 100755 packaging/docker/start.sh

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 5fd3993..fa3e51b 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -1,18 +1,26 @@
-# ikiwiki
+# radsecproxy-web
 #
 # Generates static HTML from an ikiwiki git repo.
 #
 
+# Run as a "data volume container" (`docker create -v
+# /var/www/radsecproxy --name radsecproxy-web IMAGE /mkhtml.sh') used
+# by another container running a web server (`docker run -d
+# --volumes-from radsecproxy-web --name my_web lighttpd')
+
+
 FROM web_software_ndn
 MAINTAINER Linus Nordberg <linus+radsecproxy@nordu.net>
 
 RUN apt-get update
 RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections
-RUN apt-get -y -q install unattended-upgrades
 RUN apt-get -y -q install ikiwiki make
 
-RUN git clone https://git.nordu.net/radsecproxy-web.git /usr/local/src/
+RUN [ -d /usr/local/src/radsecproxy-web ] || git clone https://git.nordu.net/radsecproxy-web.git /usr/local/src/
+WORKDIR /usr/local/src/radsecproxy-web
+RUN git pull
 
+WORKDIR /root
 VOLUME /var/www/radsecproxy
-ADD start.sh /
-ENTRYPOINT ["/start.sh"]
+ADD mkhtml.sh /
+ENTRYPOINT ["/mkhtml.sh"]
diff --git a/packaging/docker/mkhtml.sh b/packaging/docker/mkhtml.sh
new file mode 100755
index 0000000..953c2d6
--- /dev/null
+++ b/packaging/docker/mkhtml.sh
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+DESTDIR="$1"
+[ -z "$DESTDIR" ] && DESTDIR=/var/www/radsecproxy
+
+if [ -f /usr/local/src/radsecproxy-web/Makefile ]; then
+        make -C /usr/local/src/radsecproxy-web DESTDIR=$DESTDIR
+fi
diff --git a/packaging/docker/start.sh b/packaging/docker/start.sh
deleted file mode 100755
index fe47429..0000000
--- a/packaging/docker/start.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-if [ -f /usr/local/src/radsecproxy-web/Makefile ]; then
-        make -C /usr/local/src/radsecproxy-web DESTDIR=/var/www/radsecproxy
-fi
-- 
cgit v1.1