From 1bb55160e0de67dca1242c9901b78784db949d47 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Fri, 18 Mar 2022 23:22:06 -0400 Subject: [PATCH] Use composer for more extensions --- Dockerfile | 14 ++------------ composer.local.json | 3 +++ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa66ed1..f479bb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,26 +12,16 @@ RUN cd /var/www/html/ && composer update --no-dev # Needed for making branch name from MEDIAWIKI_MAJOR_VERSION SHELL ["/bin/bash", "-c"] +# from composer.local.json: # https://www.mediawiki.org/wiki/Extension:PluggableAuth -RUN git clone --depth 1 -b REL${MEDIAWIKI_MAJOR_VERSION/./_} \ - https://gerrit.wikimedia.org/r/mediawiki/extensions/PluggableAuth \ - /var/www/html/extensions/PluggableAuth - # https://www.mediawiki.org/wiki/Extension:LDAPProvider -RUN git clone --depth 1 -b REL${MEDIAWIKI_MAJOR_VERSION/./_} \ - https://github.com/wikimedia/mediawiki-extensions-LDAPProvider \ - /var/www/html/extensions/LDAPProvider +# https://www.mediawiki.org/wiki/Extension:LDAPAuthentication2 # https://www.mediawiki.org/wiki/Extension:LDAPUserInfo RUN git clone --depth 1 -b REL${MEDIAWIKI_MAJOR_VERSION/./_} \ https://github.com/wikimedia/mediawiki-extensions-LDAPUserInfo \ /var/www/html/extensions/LDAPUserInfo -# https://www.mediawiki.org/wiki/Extension:LDAPAuthentication2 -RUN git clone --depth 1 -b REL${MEDIAWIKI_MAJOR_VERSION/./_} \ - https://github.com/wikimedia/mediawiki-extensions-LDAPAuthentication2 \ - /var/www/html/extensions/LDAPAuthentication2 - # https://www.mediawiki.org/wiki/Extension:MobileFrontend RUN git clone --depth 1 -b REL${MEDIAWIKI_MAJOR_VERSION/./_} \ https://gerrit.wikimedia.org/r/mediawiki/extensions/MobileFrontend \ diff --git a/composer.local.json b/composer.local.json index 8d12f26..6cb915a 100644 --- a/composer.local.json +++ b/composer.local.json @@ -1,5 +1,8 @@ { "require": { + "mediawiki/pluggable-auth": "^5.7", + "mediawiki/ldap-provider": "^1.0", + "mediawiki/ldap-authentication-2": "^1.0", "mediawiki/semantic-media-wiki": "^4.0", "mediawiki/semantic-scribunto": "^2.0", "mediawiki/semantic-result-formats": "^4.0",