diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-12-01 20:51:47 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-12-01 20:51:47 +0100 |
| commit | 43411bfd248d2a0db42bcece3a1b5dbb294432e7 (patch) | |
| tree | f832439717529a0208c5806278710886c3a0d3eb /packaging/docker/Dockerfile | |
| parent | 46be38b25df7b2177bb5437bf5351a54b17518b5 (diff) | |
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.
Diffstat (limited to 'packaging/docker/Dockerfile')
| -rw-r--r-- | packaging/docker/Dockerfile | 18 |
1 files changed, 13 insertions, 5 deletions
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"] |