Merge pull request #24 from ubc/update-caliper

Update Caliper

Dockerfile

@@ -83,9 +83,9 @@ RUN EXTS=`curl https://extdist.wmflabs.org/dist/extensions/ | awk 'BEGIN { FS =
     && echo "Installing https://github.com/wikimedia/mediawiki-extensions-GoogleAnalyticsMetrics/archive/master.tar.gz" \
     && mkdir -p /var/www/html/extensions/GoogleAnalyticsMetrics \
     && curl -Ls https://github.com/wikimedia/mediawiki-extensions-GoogleAnalyticsMetrics/archive/master.tar.gz | tar xz --strip=1 -C /var/www/html/extensions/GoogleAnalyticsMetrics \
-    && echo "Installing https://github.com/ubc/mediawiki-extensions-caliper/archive/master.tar.gz" \
+    && echo "Installing https://github.com/ubc/mediawiki-extensions-caliper/archive/v2.0.0.tar.gz" \
     && mkdir -p /var/www/html/extensions/caliper \
-    && curl -Ls https://github.com/ubc/mediawiki-extensions-caliper/archive/master.tar.gz | tar xz --strip=1 -C /var/www/html/extensions/caliper \
+    && curl -Ls https://github.com/ubc/mediawiki-extensions-caliper/archive/v2.0.0.tar.gz | tar xz --strip=1 -C /var/www/html/extensions/caliper \
     && echo "Installing https://github.com/ubc/mediawiki-extensions-ubcauth/archive/master.tar.gz" \
     && mkdir -p /var/www/html/extensions/UBCAuth\
     && curl -Ls https://github.com/ubc/mediawiki-extensions-ubcauth/archive/master.tar.gz | tar xz --strip=1 -C /var/www/html/extensions/UBCAuth \

composer.local.json

@@ -1,10 +1,17 @@
 {
     "minimum-stability": "stable",
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/IMSGlobal/caliper-php"
+        }
+    ],
     "require": {
         "mediawiki/maps": "~6.0",
         "pear/mail": "1.4.1",
         "pear/mail_mime": "1.10.8",
         "pear/mail_mime-decode": "1.5.5.2",
-        "google/apiclient":"^2.2"
+        "google/apiclient":"^2.2",
+        "imsglobal/caliper": "dev-develop#c7e34e230abc7bbb647f8f94245cb649f6191bcd as 1.2.0"
     }
 }

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - ./.data/db:/var/lib/mysql
     ports:
       - 3306:3306
-  web:
+  web: &app
     image: ubcctlt/mediawiki
     build: .
     ports:
@@ -26,6 +26,7 @@ services:
       # do not uncomment this when starting a new instance from scratch as
       # init script won't be able to move this file
       #- ./LocalSettings.php:/var/www/html/LocalSettings.php
+      #- ./CustomHooks.php:/var/www/html/CustomHooks.php
       # FIXME this is a custom change on Parsoid PHP implementation since mw 1.35.
       # the Parsoid domain is not configurable. so we needed to disable the check as we are using "localhost" in Restbase redirection
       - ./ParsoidHandler_custom_1_35.php:/var/www/html/vendor/wikimedia/parsoid/extension/src/Rest/Handler/ParsoidHandler.php
@@ -76,6 +77,11 @@ services:
       # - CaliperAPIKey=PUT_TEST_BEARER_TOKEN_HERE
       # - CaliperAppBaseUrl=http://localhost:8888/test_url/
       # - CaliperLDAPActorHomepage=http://media_wiki_ldap_homepage
+  job_runner:
+    <<: *app
+    command: php /var/www/html/maintenance/runJobs.php --wait
+    ports:
+      - 8081:80
 
 # use combined image for now
 #  parsoid: