From 84bcd38daad78e809f0e80599388b53b95174062 Mon Sep 17 00:00:00 2001 From: boris Date: Sun, 31 May 2020 20:57:38 -0500 Subject: [PATCH 1/3] Updated ubuntu base to ubuntu:18.04 and dokuwiki to 2018-04-22c --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index efa9bc2..5698f01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,17 +5,17 @@ # TO_RUN: docker run -d -p 80:80 --name my_wiki mprasil/dokuwiki -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER Miroslav Prasil # Set the version you want of Twiki -ENV DOKUWIKI_VERSION=2018-04-22b -ARG DOKUWIKI_CSUM=605944ec47cd5f822456c54c124df255 +ENV DOKUWIKI_VERSION=2018-04-22c +ARG DOKUWIKI_CSUM=6272e552b9a71a764781bd4182dd2b7d ARG DOKUWIKI_DEBIAN_PACKAGES="" # Update & install packages & cleanup afterwards -RUN DEBIAN_FRONTEND=noninteractive \ - apt-get update && \ +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && \ apt-get -y upgrade && \ apt-get -y install \ wget \ @@ -52,4 +52,3 @@ VOLUME ["/dokuwiki/data/","/dokuwiki/lib/plugins/","/dokuwiki/conf/","/dokuwiki/ ENTRYPOINT ["/startup.sh"] CMD ["run"] - From c3d766cac35e12b484f076de7f931f23295dc04c Mon Sep 17 00:00:00 2001 From: boris Date: Mon, 1 Jun 2020 15:45:16 -0500 Subject: [PATCH 2/3] removed the ENV for DEBIAN_FRONTEND=noninteractive and use export instead --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index efa9bc2..64b1cd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ARG DOKUWIKI_CSUM=605944ec47cd5f822456c54c124df255 ARG DOKUWIKI_DEBIAN_PACKAGES="" # Update & install packages & cleanup afterwards -RUN DEBIAN_FRONTEND=noninteractive \ +RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get -y upgrade && \ apt-get -y install \ From 59e7c26bc17341c7328516dca73428b9462a3ded Mon Sep 17 00:00:00 2001 From: boris Date: Mon, 1 Jun 2020 16:38:09 -0500 Subject: [PATCH 3/3] Added perl-modules-5.26 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3cbb972..76ddd2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ARG DOKUWIKI_CSUM=6272e552b9a71a764781bd4182dd2b7d ARG DOKUWIKI_DEBIAN_PACKAGES="" # Update & install packages & cleanup afterwards -RUN DEBIAN_FRONTEND=noninteractive && \ +RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get -y upgrade && \ apt-get -y install \ @@ -26,6 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive && \ php-curl \ php-xml \ php-mbstring \ + perl-modules-5.26 \ ${DOKUWIKI_DEBIAN_PACKAGES} && \ apt-get clean autoclean && \ apt-get autoremove && \