From 529554b4d1b377bd9f13550a94bc69a0e7b572d2 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Mon, 8 Jan 2024 21:48:26 +0100 Subject: [PATCH] fix: revert adding QuickInstantCommons extension https://wiki.pub.solar/index.php/Special:RecentChanges throws: Internal error LogicException: Backend with name 'wikimediacommons-backend' already registered. --- Dockerfile | 8 -------- README.md | 5 ----- 2 files changed, 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f5456b..b8739be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ RUN docker-php-ext-configure pgsql --with-pgsql=/usr/local/pgsql && \ ENV PLUGGABLE_AUTH_VERSION=REL1_41-0273c84 ENV OPENID_CONNECT_VERSION=REL1_41-7aa039e ENV TEMPLATE_STYLES_VERSION=REL1_41-a9dde29 -ENV QUICK_INSTANT_COMMONS_VERSION=REL1_41-c472ea9 RUN export PLUGGABLE_AUTH_SHA256SUM=9a3d8d7c1e5234bf932747b08b09c2577b08afb252a6dd995b1b0e26beb97af9 && \ export archive=PluggableAuth-${PLUGGABLE_AUTH_VERSION}.tar.gz && \ @@ -31,13 +30,6 @@ RUN export TEMPLATE_STYLES_SHA256SUM=74c3287f8c8658d6e12dc16a2dd8587505695f684eb tar --extract --gzip --file /tmp/${archive} --directory /var/www/html/extensions && \ rm /tmp/${archive} -RUN export QUICK_INSTANT_COMMONS_SHA256SUM=83dfbc9558255bb6e748b3d794b9e1a5a78395ec337787ab1a0ce7d4e2db6f59 && \ - export archive=QuickInstantCommons-${QUICK_INSTANT_COMMONS_VERSION}.tar.gz && \ - curl --location --silent --output /tmp/${archive} https://extdist.wmflabs.org/dist/extensions/${archive} && \ - echo "${QUICK_INSTANT_COMMONS_SHA256SUM} /tmp/${archive}" | sha256sum --check && \ - tar --extract --gzip --file /tmp/${archive} --directory /var/www/html/extensions && \ - rm /tmp/${archive} - RUN echo '{ "extra": { "merge-plugin": { "include": [ "extensions/OpenIDConnect/composer.json" ] } } }' \ > /var/www/html/composer.local.json && \ php -r "copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');" && \ diff --git a/README.md b/README.md index 777d179..5ac5f98 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ Currently used mediawiki extensions in this customized docker image: * [PluggableAuth](https://www.mediawiki.org/wiki/Extension:PluggableAuth) * [OpenID_Connect](https://www.mediawiki.org/wiki/Extension:OpenID_Connect) * [TemplateStyles](https://www.mediawiki.org/wiki/Extension:TemplateStyles) -* [QuickInstantCommons](https://www.mediawiki.org/wiki/Extension:QuickInstantCommons) ### Updating the docker image @@ -28,7 +27,6 @@ image version, e.g. `1.41.0`) ... 1. PluggableAuth download https://www.mediawiki.org/wiki/Special:ExtensionDistributor/PluggableAuth 2. OpenID_Connect download https://www.mediawiki.org/wiki/Special:ExtensionDistributor/OpenIDConnect 3. TemplateStyles download https://www.mediawiki.org/wiki/Special:ExtensionDistributor/TemplateStyles -4. QuickInstantCommons download https://www.mediawiki.org/wiki/Special:ExtensionDistributor/QuickInstantCommons ... and replace the SHA256 hash in `Dockerfile` for each file by running: @@ -41,9 +39,6 @@ sed -i "s/OPENID_CONNECT_SHA256SUM= *[^ ]*/OPENID_CONNECT_SHA256SUM=${NEW_OPENID NEW_TEMPLATE_STYLE_HASH=$(sha256sum ~/Downloads/TemplateStyles-REL1_41-a9dde29.tar.gz | cut -d " " -f1) sed -i "s/TEMPLATE_STYLES_SHA256SUM= *[^ ]*/TEMPLATE_STYLES_SHA256SUM=${NEW_TEMPLATE_STYLE_HASH}/" Dockerfile - -NEW_QUICK_INSTANT_COMMONS_HASH=$(sha256sum ~/Downloads/QuickInstantCommons-REL1_41-c472ea9.tar.gz | cut -d " " -f1) -sed -i "s/QUICK_INSTANT_COMMONS_SHA256SUM= *[^ ]*/QUICK_INSTANT_COMMONS_SHA256SUM=${NEW_QUICK_INSTANT_COMMONS_HASH}/" Dockerfile ``` After making your changes and [testing them locally](#local-testing), run the