From 7e2b14fc310f7617436369bad75e6bf68bc4cb17 Mon Sep 17 00:00:00 2001 From: Adrian Malacoda Date: Mon, 22 Jun 2015 21:29:05 -0500 Subject: [PATCH] Update to 1.25 branch --- Dockerfile | 2 +- LICENSE | 4 ++-- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce75efb..615daf1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM tutum/apache-php:latest MAINTAINER Adrian Malacoda -ENV MW_VERSION REL1_24 +ENV MW_VERSION REL1_25 WORKDIR / diff --git a/LICENSE b/LICENSE index 712765b..cf651bc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 Leibnitius +Copyright (c) 2014 Leibnitius, 2015 Adrian Malacoda Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/README.md b/README.md index 6074759..7a87d80 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Mediawiki-Apache ================ -This is a Docker image running Apache serving Mediawiki 1.23. It does not contain any databases; those should be run in a seperate container. +This is a Docker image running Apache serving Mediawiki 1.25. It does not contain any databases; those should be run in a seperate container. First, deploy a database container, [like this one by Tutum](https://registry.hub.docker.com/u/tutum/mariadb/):