Merged in famasa/docker_dokuwiki (pull request #14)

Updated ubuntu base to ubuntu:18.04 and dokuwiki to 2018-04-22c

Approved-by: Boris <boris.ondercin+bitbucket@famasa.com>
master
Boris 4 years ago committed by Miroslav Prasil
commit 995877c512
  1. 12
      Dockerfile

@ -1,20 +1,20 @@
# VERSION 0.1 # VERSION 0.2
# AUTHOR: Miroslav Prasil <miroslav@prasil.info> # AUTHOR: Miroslav Prasil <miroslav@prasil.info>
# DESCRIPTION: Image with DokuWiki & lighttpd # DESCRIPTION: Image with DokuWiki & lighttpd
# TO_BUILD: docker build -t mprasil/dokuwiki . # TO_BUILD: docker build -t mprasil/dokuwiki .
# TO_RUN: docker run -d -p 80:80 --name my_wiki mprasil/dokuwiki # TO_RUN: docker run -d -p 80:80 --name my_wiki mprasil/dokuwiki
FROM ubuntu:16.04 FROM ubuntu:18.04
MAINTAINER Miroslav Prasil <miroslav@prasil.info> MAINTAINER Miroslav Prasil <miroslav@prasil.info>
# Set the version you want of Twiki # Set the version you want of Twiki
ENV DOKUWIKI_VERSION=2018-04-22b ENV DOKUWIKI_VERSION=2018-04-22c
ARG DOKUWIKI_CSUM=605944ec47cd5f822456c54c124df255 ARG DOKUWIKI_CSUM=6272e552b9a71a764781bd4182dd2b7d
ARG DOKUWIKI_DEBIAN_PACKAGES="" ARG DOKUWIKI_DEBIAN_PACKAGES=""
# Update & install packages & cleanup afterwards # Update & install packages & cleanup afterwards
RUN DEBIAN_FRONTEND=noninteractive \ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \ apt-get update && \
apt-get -y upgrade && \ apt-get -y upgrade && \
apt-get -y install \ apt-get -y install \
@ -26,6 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
php-curl \ php-curl \
php-xml \ php-xml \
php-mbstring \ php-mbstring \
perl-modules-5.26 \
${DOKUWIKI_DEBIAN_PACKAGES} && \ ${DOKUWIKI_DEBIAN_PACKAGES} && \
apt-get clean autoclean && \ apt-get clean autoclean && \
apt-get autoremove && \ apt-get autoremove && \
@ -52,4 +53,3 @@ VOLUME ["/dokuwiki/data/","/dokuwiki/lib/plugins/","/dokuwiki/conf/","/dokuwiki/
ENTRYPOINT ["/startup.sh"] ENTRYPOINT ["/startup.sh"]
CMD ["run"] CMD ["run"]

Loading…
Cancel
Save