Skip to content

Commit 50560f9

Browse files
committed
AWS 3.67 -> 3.277 via my fork
1 parent 8663a9e commit 50560f9

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

Dockerfile

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM docker.io/mediawiki:1.40
22

33
RUN apt-get update; \
4-
apt-get install -y wget unzip;
4+
apt-get install -y wget unzip vim;
55

66
WORKDIR /tmp
77

@@ -20,7 +20,11 @@ RUN wget https://github.com/Telshin/Spoilers/archive/master.zip; \
2020
wget https://github.com/wikimedia/mediawiki-extensions-OpenIDConnect/archive/refs/heads/master.zip; \
2121
unzip master.zip; \
2222
mv mediawiki-extensions-OpenIDConnect-master /var/www/html/extensions/OpenIDConnect; \
23-
rm master.zip;
23+
rm master.zip; \
24+
wget https://github.com/WillNilges/mediawiki-aws-s3/archive/refs/heads/master.zip; \
25+
unzip master.zip; \
26+
mv mediawiki-aws-s3-master /var/www/html/extensions/AWS; \
27+
rm master.zip;
2428

2529
WORKDIR /var/www/html
2630

@@ -32,5 +36,6 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" &&
3236
mv composer.phar /usr/local/bin/composer
3337

3438
RUN chown -R www-data:www-data composer.json
35-
RUN composer require mediawiki/pluggable-auth jumbojett/openid-connect-php edwardspec/mediawiki-aws-s3
39+
RUN composer require mediawiki/pluggable-auth jumbojett/openid-connect-php
40+
#edwardspec/mediawiki-aws-s3
3641
RUN composer update

composer.local.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2-
"require": {
3-
"mediawiki/openidconnect": "dev-master"
4-
}
2+
"extra": {
3+
"merge-plugin": {
4+
"include": [
5+
"extensions/AWS/composer.json"
6+
]
7+
}
8+
}
59
}
6-

0 commit comments

Comments
 (0)