From fad871e386f265d50e57824f6041d1428ad1e485 Mon Sep 17 00:00:00 2001 From: nevotheless Date: Fri, 14 Dec 2018 23:07:09 +0100 Subject: [PATCH] Update to php:7.3-apache --- Dockerfile | 6 +++--- README.md | 8 ++++---- docker-compose.yml | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3193c8d..31df71a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -#dokuwiki-docker dockerfile -FROM php:7.1-apache +# dokuwiki-docker dockerfile +FROM php:7.3-apache -LABEL maintainer kopplow.tim@gmail.com +LABEL maintainer tim@arctium.io # Download dokuwiki source RUN curl -O https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz diff --git a/README.md b/README.md index 6c46c83..a919db1 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ [![](https://images.microbadger.com/badges/image/ununseptium/dokuwiki-docker.svg)](https://microbadger.com/images/ununseptium/dokuwiki-docker "Get your own image badge on microbadger.com") # dokuwiki-docker -simple to use and highly versatile Open Source wiki ... containerized +Simple to use and highly versatile open-source wiki... conveniently packaged as a container image > This Dockerfile contains a thinner and more modern approach to run a dockerized version of dokuwiki. -> It's based on the php:7.1-apache image which ships with apache and php7 right out of the box. +> It's based on the php:7.3-apache image which ships with apache and php7 right out of the box. -## how to run +## How-to use the Image -Instead of just starting a container right from the dockerfile use the docker-compose feature with a `docker-compose.yml` file like this instead. +Instead of just starting a container right from the dockerfile, just use the docker-compose feature with a `docker-compose.yml` file like this instead. ``` version: '2' diff --git a/docker-compose.yml b/docker-compose.yml index 44b5cc0..44f251f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ +# Example docker-compose file version: '2' services: dokuwiki: