Update to 1.25 branch

This commit is contained in:
Adrian Malacoda 2015-06-22 21:29:05 -05:00
parent 479bad80ca
commit 7e2b14fc31
3 changed files with 4 additions and 4 deletions

View File

@ -5,7 +5,7 @@
FROM tutum/apache-php:latest FROM tutum/apache-php:latest
MAINTAINER Adrian Malacoda <adrian.malacoda@monarch-pass.net> MAINTAINER Adrian Malacoda <adrian.malacoda@monarch-pass.net>
ENV MW_VERSION REL1_24 ENV MW_VERSION REL1_25
WORKDIR / WORKDIR /

View File

@ -1,6 +1,6 @@
The MIT License (MIT) 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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal 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 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.

View File

@ -1,7 +1,7 @@
Mediawiki-Apache 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/): First, deploy a database container, [like this one by Tutum](https://registry.hub.docker.com/u/tutum/mariadb/):