Update 'Dockerfile'

Dockerfile

@@ -6,11 +6,19 @@ MAINTAINER Adrian Malacoda <adrian.malacoda@monarch-pass.net>
 
 WORKDIR /
 
+# Install composer
+RUN apt-get -y update && apt-get install -y --no-install-recommends git zip
+RUN curl --silent --show-error https://getcomposer.org/installer | php && \
+    chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
+
 # Install extensions
 ADD add_extension.sh /add_extension.sh
 RUN chmod +x add_extension.sh
-RUN ./add_extension.sh Scribunto $MEDIAWIKI_BRANCH
+RUN ./add_extension.sh Scribunto $MEDIAWIKI_BRANCH && \
+    ./add_extension.sh VisualEditor $MEDIAWIKI_BRANCH
 
+ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /wait-for-it
 ADD setup.sh /setup.sh
-RUN chmod +x /setup.sh
+ADD get-variable /get-variable
+RUN chmod +x setup.sh && chmod +x wait-for-it && chmod +x get-variable
 CMD ["/setup.sh"]

README.md

@@ -1,30 +1,13 @@
-Notice
+# Monarch-Pass.net MediaWiki Image
-======
+This is the image used for MediaWiki instances hosted on monarch-pass.net (other than Glitch City Laboratories and Infinitypedia).
-This image is deprecated. It will be maintained for personal use as long as it is feasible to do so. Please don't start a new instance using this image; instead consider one of the other actively maintained images such as [the official one](https://hub.docker.com/r/_/mediawiki/).
 
-Mediawiki-Apache
+It extends [the official image](https://hub.docker.com/_/mediawiki/) with the following additions:
-================
 
-This is a Docker image running Apache serving Mediawiki 1.30. It does not contain any databases; those should be run in a seperate container.
+## Extensions
+* Scribunto
+* VisualEditor
 
-First, deploy a database container, [like this one by Tutum](https://registry.hub.docker.com/u/tutum/mariadb/):
+VisualEditor requires a Parsoid service; see `docker-compose.yml` for example.
 
-```
+## Auto-migration
-docker run -d --name mariadb tutum/mariadb
+The image will automatically run migration when a new version is installed.
-```
-
-You will likely want to make the database persistent, in this case done by adding:
-
-```
-docker run -d -v /path/on/host:/var/lib/mysql --name mariadb tutum/mariadb
-```
-
-Now you can deploy this container by running:
-
-```
-docker run -d -p 80:80 -v /path/on/host:/var/lib/mediawiki --link mariadb:mariadb iohannesarnold/mediawiki-apache
-```
-
-Where the ```-v``` flag is only necessary if you're interested in preserving files. Also, the ```link``` flag should reflect the name you gave your database container above.
-Mediawiki should now be available on port 80 of the host server, and it will ask you to run configuration. The ```LocalSettings.php``` that results should be placed in the linked host directory created in the last step.
-Congratulations! You now should have a working Mediawiki installation. Any updated version of this image should be able to be deployed over the same host directory for fast upgrades.

docker-compose.yml

@@ -17,3 +17,8 @@ services:
         links:
             - db
             - cache
+            - parsoid
+    parsoid:
+        image: thenets/parsoid:0.10
+        environment:
+            PARSOID_DOMAIN_web: http://web/api.php

get-variable

@@ -0,0 +1,10 @@
+#!/usr/bin/env php
+<?php
+define("MEDIAWIKI", 1);
+define("HTML_ROOT", "/var/www/html");
+
+function wfLoadSkin() {}
+function wfLoadExtension() {}
+
+@include HTML_ROOT . "/LocalSettings.php";
+print_r($GLOBALS[$argv[1]]);

setup.sh

@@ -5,6 +5,8 @@ HTML_ROOT=/var/www/html
 # Run updater if we have an existing install
 if [[ -e "$HTML_ROOT/LocalSettings.php" ]]; then
     cd "$HTML_ROOT/maintenance"
+    DB_SERVER=$(/get-variable wgDBserver)
+    /wait-for-it "$DB_SERVER:3306"
     php update.php
 fi