From 53348c6c8e544dc0984f50f853dbbbf0962e9185 Mon Sep 17 00:00:00 2001
From: Paul <paul@zom.bi>
Date: Sat, 25 Sep 2021 11:12:31 +0200
Subject: [PATCH 1/3] Bump dependencies
---
Dockerfile | 12 ++++++------
composer.local.json | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 86e086f..94be2c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
FROM mediawiki:1.35
# Plugins are not compatible with composer 2 yet
-ARG COMPOSER_VERSION=1.10.21
+ARG COMPOSER_VERSION=1.10.22
ENV \
WG_SITENAME="Test Wiki" \
@@ -60,11 +60,11 @@ RUN set -eu; \
# JsonConfig required by Graph.
RUN set -eu; \
cd /var/www/html/extensions; \
- curl https://extdist.wmflabs.org/dist/extensions/JsonConfig-REL1_35-1b79879.tar.gz |tar -xz; \
- curl https://extdist.wmflabs.org/dist/extensions/Graph-REL1_35-09f0338.tar.gz |tar -xz; \
- curl https://extdist.wmflabs.org/dist/extensions/SubPageList3-REL1_35-622c298.tar.gz |tar -xz; \
- curl https://extdist.wmflabs.org/dist/extensions/MsUpload-REL1_35-5998b96.tar.gz |tar -xz; \
- curl https://extdist.wmflabs.org/dist/extensions/TemplateStyles-REL1_35-7a40a6a.tar.gz |tar -xz
+ curl https://extdist.wmflabs.org/dist/extensions/JsonConfig-REL1_35-a33f0ce.tar.gz |tar -xz; \
+ curl https://extdist.wmflabs.org/dist/extensions/Graph-REL1_35-cfbc8e6.tar.gz |tar -xz; \
+ curl https://extdist.wmflabs.org/dist/extensions/SubPageList3-REL1_35-df04b70.tar.gz |tar -xz; \
+ curl https://extdist.wmflabs.org/dist/extensions/MsUpload-REL1_35-2c46852.tar.gz |tar -xz; \
+ curl https://extdist.wmflabs.org/dist/extensions/TemplateStyles-REL1_35-dae9271.tar.gz |tar -xz
# Install composer packages
RUN set -eu; \
diff --git a/composer.local.json b/composer.local.json
index fd3d46b..1cf7f3f 100644
--- a/composer.local.json
+++ b/composer.local.json
@@ -1,8 +1,8 @@
{
"require": {
- "mediawiki/semantic-bundle": "~4.0",
+ "mediawiki/semantic-bundle": "~5.0",
"mediawiki/semantic-scribunto": "~2.1",
- "wikimedia/css-sanitizer": "2.0.1"
+ "wikimedia/css-sanitizer": "3.0.2"
}
}
\ No newline at end of file
From 3e1566d1e79dfe98ae21460271ba10b9f026e59c Mon Sep 17 00:00:00 2001
From: Paul <paul@zom.bi>
Date: Sun, 12 Sep 2021 16:33:09 +0200
Subject: [PATCH 2/3] Bump Mediawiki to 1.36
---
Dockerfile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 94be2c8..0b000be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mediawiki:1.35
+FROM mediawiki:1.36
# Plugins are not compatible with composer 2 yet
ARG COMPOSER_VERSION=1.10.22
@@ -60,11 +60,11 @@ RUN set -eu; \
# JsonConfig required by Graph.
RUN set -eu; \
cd /var/www/html/extensions; \
- curl https://extdist.wmflabs.org/dist/extensions/JsonConfig-REL1_35-a33f0ce.tar.gz |tar -xz; \
- curl https://extdist.wmflabs.org/dist/extensions/Graph-REL1_35-cfbc8e6.tar.gz |tar -xz; \
- curl https://extdist.wmflabs.org/dist/extensions/SubPageList3-REL1_35-df04b70.tar.gz |tar -xz; \
- curl https://extdist.wmflabs.org/dist/extensions/MsUpload-REL1_35-2c46852.tar.gz |tar -xz; \
- curl https://extdist.wmflabs.org/dist/extensions/TemplateStyles-REL1_35-dae9271.tar.gz |tar -xz
+ curl https://extdist.wmflabs.org/dist/extensions/JsonConfig-REL1_36-609a991.tar.gz |tar -xz; \
+ curl https://extdist.wmflabs.org/dist/extensions/Graph-REL1_36-67b02d1.tar.gz |tar -xz; \
+ curl https://extdist.wmflabs.org/dist/extensions/SubPageList3-REL1_36-f5d7175.tar.gz |tar -xz; \
+ curl https://extdist.wmflabs.org/dist/extensions/MsUpload-REL1_36-a6bfb91.tar.gz |tar -xz; \
+ curl https://extdist.wmflabs.org/dist/extensions/TemplateStyles-REL1_36-b82a604.tar.gz |tar -xz
# Install composer packages
RUN set -eu; \
From 8a985493161fe515156f29ff314f94837230c454 Mon Sep 17 00:00:00 2001
From: Paul <paul@zom.bi>
Date: Sun, 12 Sep 2021 16:37:40 +0200
Subject: [PATCH 3/3] Update composer to >2
---
Dockerfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 0b000be..7e82a9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
FROM mediawiki:1.36
-# Plugins are not compatible with composer 2 yet
-ARG COMPOSER_VERSION=1.10.22
+ARG COMPOSER_VERSION=2.1.6
ENV \
WG_SITENAME="Test Wiki" \