From cbf7374c2c4a235e0ed399d7cf173a8abd638c21 Mon Sep 17 00:00:00 2001 From: Seaswimmer Date: Tue, 6 Aug 2024 01:51:24 -0400 Subject: [PATCH] use composer.local.json-sample instead of manual composer configuration --- mediawiki/Dockerfile | 2 +- mediawiki/composer.local.json | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 mediawiki/composer.local.json diff --git a/mediawiki/Dockerfile b/mediawiki/Dockerfile index ca0b69c..7d40be2 100644 --- a/mediawiki/Dockerfile +++ b/mediawiki/Dockerfile @@ -77,7 +77,7 @@ RUN tar -xvf CheckUser.tar.gz \ RUN wget https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer -O - -q | php -- --quiet \ && mv composer.phar /usr/local/bin/composer -COPY composer.local.json /var/www/html/composer.local.json +RUN mv /var/www/html/composer.local.json-sample /var/www/html/composer.local.json RUN cd /var/www/html && composer update && cd - diff --git a/mediawiki/composer.local.json b/mediawiki/composer.local.json deleted file mode 100644 index 5654959..0000000 --- a/mediawiki/composer.local.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extra": { - "merge-plugin": { - "include": [ - "extensions/AWS/composer.json", - "extensions/CheckUser/composer.json" - ] - } - } -}