Dockerfile

@@ -1,16 +1,16 @@
-# VERSION 0.2
+# VERSION 0.1
 # AUTHOR:         Miroslav Prasil <miroslav@prasil.info>
 # DESCRIPTION:    Image with DokuWiki & lighttpd
 # TO_BUILD:       docker build -t mprasil/dokuwiki .
 # TO_RUN:         docker run -d -p 80:80 --name my_wiki mprasil/dokuwiki
 
 
-FROM ubuntu:18.04
+FROM ubuntu:16.04
 MAINTAINER Miroslav Prasil <miroslav@prasil.info>
 
 # Set the version you want of Twiki
-ENV DOKUWIKI_VERSION=2020-07-29
-ARG DOKUWIKI_CSUM=8867b6a5d71ecb5203402fe5e8fa18c9
+ENV DOKUWIKI_VERSION=2018-04-22b
+ARG DOKUWIKI_CSUM=605944ec47cd5f822456c54c124df255
 ARG DOKUWIKI_DEBIAN_PACKAGES=""
 
 # Update & install packages & cleanup afterwards
@@ -26,7 +26,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         php-curl \
         php-xml \
         php-mbstring \
-        perl-modules-5.26 \
         ${DOKUWIKI_DEBIAN_PACKAGES} && \
     apt-get clean autoclean && \
     apt-get autoremove && \
@@ -49,7 +48,8 @@ RUN mkdir /var/run/lighttpd && chown www-data.www-data /var/run/lighttpd
 COPY docker-startup.sh /startup.sh
 
 EXPOSE 80
-VOLUME ["/dokuwiki/data/","/dokuwiki/lib/","/dokuwiki/conf/","/var/log/"]
+VOLUME ["/dokuwiki/data/","/dokuwiki/lib/plugins/","/dokuwiki/conf/","/dokuwiki/lib/tpl/","/var/log/"]
 
 ENTRYPOINT ["/startup.sh"]
 CMD ["run"]
+

README.md

@@ -5,14 +5,7 @@ DokuWiki docker container
 To run image:
 -------------
 
-First, build the image locally to incorporate the changes [from the upstream
-image](https://hub.docker.com/r/mprasil/dokuwiki):
-
-    docker build -t my_dokuwiki .
-
-Once built, a container of this modified image can be run:
-
-	docker run -d -p 80:80 --name my_wiki my_dokuwiki
+	docker run -d -p 80:80 --name my_wiki mprasil/dokuwiki 
 
 You can now visit the install page to configure your new DokuWiki wiki.
 
@@ -26,7 +19,8 @@ The run command above will store your data in internal Docker volumes. If you pr
     docker run -d -p 80:80 --name my_wiki \
         -v /data/docker/dokuwiki/data:/dokuwiki/data \
         -v /data/docker/dokuwiki/conf:/dokuwiki/conf \
-        -v /data/docker/dokuwiki/lib:/dokuwiki/lib \
+        -v /data/docker/dokuwiki/lib/plugins:/dokuwiki/lib/plugins \
+        -v /data/docker/dokuwiki/lib/tpl:/dokuwiki/lib/tpl \
         -v /data/docker/dokuwiki/logs:/var/log \
         mprasil/dokuwiki
 
@@ -86,3 +80,9 @@ nice URLs in settings (Advanced -> Nice URLs, set to ".htaccess")
 
 For better performance enable xsendfile in settings.
 Set to proprietary lighttpd header (for lighttpd < 1.5)
+
+Build your own
+--------------
+
+	docker build -t my_dokuwiki .
+

docker-startup.sh

@@ -25,7 +25,7 @@ if [ "$1" = 'overwrite' ]; then overwrite=1; else overwrite=0; fi
 
 if [ "$1" = 'run' ] || [ "$1" = 'downgrade' ] || [ "$1" = 'overwrite' ]; then
     # Check each volume directory in turn
-    for d in conf data lib; do
+    for d in conf data lib/plugins lib/tpl; do
         if [ -f "$dokudir/$d/$verfile" ]; then
             volumever="$(date -f <(awk '{print $1}' "$dokudir/$d/$verfile" | tr -d '[:alpha:]') +%s)"
         else