From 14aab38a5129f650e7f6faf25057bd57b3be9d65 Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <adrian.malacoda@monarch-pass.net>
Date: Fri, 5 Dec 2014 08:49:05 -0600
Subject: [PATCH] Update to mediawiki 1.24

---
 Dockerfile       | 36 +++++++++++++++++++-----------------
 add_extension.sh |  4 +++-
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5828d67..b596017 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,32 +5,34 @@
 FROM tutum/apache-php:latest
 MAINTAINER John E Arnold <iohannes.eduardus.arnold@gmail.com>
 
+ENV MW_VERSION REL1_24
+
 WORKDIR /
 
 # Remove the old hello world app and grab Mediawiki source
 RUN apt-get update && apt-get install -yq git && rm -rf /var/lib/apt/lists/*
 RUN rm -fr /app && mv /var/www/html /var/www/w && git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git /app
-RUN cd /app && git checkout -b REL1_23 origin/REL1_23
+RUN cd /app && git checkout -b $MW_VERSION origin/$MW_VERSION
 
 # Install extensions
 ADD add_extension.sh /add_extension.sh
 RUN chmod +x add_extension.sh
-RUN ./add_extension.sh Renameuser && \
-    ./add_extension.sh ImageMap && \
-    ./add_extension.sh Cite && \
-    ./add_extension.sh InputBox && \
-    ./add_extension.sh LocalisationUpdate && \
-    ./add_extension.sh Interwiki && \
-    ./add_extension.sh TitleBlacklist && \
-    ./add_extension.sh Gadgets && \
-    ./add_extension.sh WikiEditor && \
-    ./add_extension.sh SpamBlacklist && \
-    ./add_extension.sh ParserFunctions && \
-    ./add_extension.sh SyntaxHighlight_GeSHi && \
-    ./add_extension.sh ConfirmEdit && \
-    ./add_extension.sh Nuke && \
-    ./add_extension.sh Poem && \
-    ./add_extension.sh PdfHandler
+RUN ./add_extension.sh Renameuser $MW_VERSION && \
+    ./add_extension.sh ImageMap $MW_VERSION && \
+    ./add_extension.sh Cite $MW_VERSION && \
+    ./add_extension.sh InputBox $MW_VERSION && \
+    ./add_extension.sh LocalisationUpdate $MW_VERSION && \
+    ./add_extension.sh Interwiki $MW_VERSION && \
+    ./add_extension.sh TitleBlacklist $MW_VERSION && \
+    ./add_extension.sh Gadgets $MW_VERSION && \
+    ./add_extension.sh WikiEditor $MW_VERSION && \
+    ./add_extension.sh SpamBlacklist $MW_VERSION && \
+    ./add_extension.sh ParserFunctions $MW_VERSION && \
+    ./add_extension.sh SyntaxHighlight_GeSHi $MW_VERSION && \
+    ./add_extension.sh ConfirmEdit $MW_VERSION && \
+    ./add_extension.sh Nuke $MW_VERSION && \
+    ./add_extension.sh Poem $MW_VERSION && \
+    ./add_extension.sh PdfHandler $MW_VERSION
 
 # Create the section for persistent files
 RUN mkdir /var/lib/mediawiki
diff --git a/add_extension.sh b/add_extension.sh
index bf0dec1..d5e69c5 100644
--- a/add_extension.sh
+++ b/add_extension.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 EXT_NAME=$1
+EXT_VERSION=$2
+
 cd /app/extensions
 git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/$1
 cd $1
-git checkout -b REL1_23 origin/REL1_23
+git checkout -b $2 origin/$2