fix 1.42.4 update script, add 1.43.0, remove EOL 1.41 #18170

christian-heusel · 2024-12-28T10:26:33Z

Link to our PR wikimedia/mediawiki-docker#152

Link to our PR wikimedia/mediawiki-docker#152 Signed-off-by: Christian Heusel <[email protected]>

github-actions · 2024-12-28T10:27:57Z

Diff for d711ed4:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index f6a0b7c..b0c7a32 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,34 +2,34 @@ Maintainers: Kunal Mehta <[email protected]> (@legoktm), addshore <addshorewiki
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le
 GitRepo: https://github.com/wikimedia/mediawiki-docker.git
 GitFetch: refs/heads/main
-GitCommit: 597ec9bc8565eefd398bc6831130fff2443b6c8a
+GitCommit: 0ff3ce3abb78429f4adc6bcf93e24f444ffa3b45
 
-Tags: 1.39.11, 1.39, lts
+Tags: 1.39.11, 1.39
 Directory: 1.39/apache
 
-Tags: 1.39.11-fpm, 1.39-fpm, lts-fpm
+Tags: 1.39.11-fpm, 1.39-fpm
 Directory: 1.39/fpm
 
-Tags: 1.39.11-fpm-alpine, 1.39-fpm-alpine, lts-fpm-alpine
+Tags: 1.39.11-fpm-alpine, 1.39-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 Directory: 1.39/fpm-alpine
 
-Tags: 1.41.5, 1.41, legacy
-Directory: 1.41/apache
+Tags: 1.42.4, 1.42, legacy
+Directory: 1.42/apache
 
-Tags: 1.41.5-fpm, 1.41-fpm, legacy-fpm
-Directory: 1.41/fpm
+Tags: 1.42.4-fpm, 1.42-fpm, legacy-fpm
+Directory: 1.42/fpm
 
-Tags: 1.41.5-fpm-alpine, 1.41-fpm-alpine, legacy-fpm-alpine
+Tags: 1.42.4-fpm-alpine, 1.42-fpm-alpine, legacy-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
-Directory: 1.41/fpm-alpine
+Directory: 1.42/fpm-alpine
 
-Tags: 1.42.4, 1.42, stable, latest
-Directory: 1.42/apache
+Tags: 1.43.0, 1.43, latest, stable, lts
+Directory: 1.43/apache
 
-Tags: 1.42.4-fpm, 1.42-fpm, stable-fpm
-Directory: 1.42/fpm
+Tags: 1.43.0-fpm, 1.43-fpm, stable-fpm, lts-fpm
+Directory: 1.43/fpm
 
-Tags: 1.42.4-fpm-alpine, 1.42-fpm-alpine, stable-fpm-alpine
+Tags: 1.43.0-fpm-alpine, 1.43-fpm-alpine, stable-fpm-alpine, lts-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
-Directory: 1.42/fpm-alpine
+Directory: 1.43/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 2564710..7367342 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,18 +4,18 @@ mediawiki:1.39-fpm-alpine
 mediawiki:1.39.11
 mediawiki:1.39.11-fpm
 mediawiki:1.39.11-fpm-alpine
-mediawiki:1.41
-mediawiki:1.41-fpm
-mediawiki:1.41-fpm-alpine
-mediawiki:1.41.5
-mediawiki:1.41.5-fpm
-mediawiki:1.41.5-fpm-alpine
 mediawiki:1.42
 mediawiki:1.42-fpm
 mediawiki:1.42-fpm-alpine
 mediawiki:1.42.4
 mediawiki:1.42.4-fpm
 mediawiki:1.42.4-fpm-alpine
+mediawiki:1.43
+mediawiki:1.43-fpm
+mediawiki:1.43-fpm-alpine
+mediawiki:1.43.0
+mediawiki:1.43.0-fpm
+mediawiki:1.43.0-fpm-alpine
 mediawiki:latest
 mediawiki:legacy
 mediawiki:legacy-fpm
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 6a1545d..8f1a6d0 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,9 @@
-mediawiki:latest
+mediawiki:1.39
+mediawiki:1.39-fpm
+mediawiki:1.39-fpm-alpine
 mediawiki:legacy
 mediawiki:legacy-fpm
 mediawiki:legacy-fpm-alpine
 mediawiki:lts
 mediawiki:lts-fpm
 mediawiki:lts-fpm-alpine
-mediawiki:stable-fpm
-mediawiki:stable-fpm-alpine
diff --git a/mediawiki_stable-fpm-alpine/Dockerfile b/mediawiki_1.39-fpm-alpine/Dockerfile
similarity index 85%
rename from mediawiki_stable-fpm-alpine/Dockerfile
rename to mediawiki_1.39-fpm-alpine/Dockerfile
index ceddff5..0c9b461 100644
--- a/mediawiki_stable-fpm-alpine/Dockerfile
+++ b/mediawiki_1.39-fpm-alpine/Dockerfile
@@ -61,8 +61,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.42
-ENV MEDIAWIKI_VERSION 1.42.4
+ENV MEDIAWIKI_MAJOR_VERSION 1.39
+ENV MEDIAWIKI_VERSION 1.39.11
 
 # MediaWiki setup
 RUN set -eux; \
@@ -74,15 +74,12 @@ RUN set -eux; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://www.mediawiki.org/keys/keys.txt
-	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \
-		D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \
-		441276E9CCD15F44F6D97D18C119E1A64D70938E \
-		F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \
-		1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \
-	; \
+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
 	gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	tar -x --strip-components=1 -f mediawiki.tar.gz; \
+	[ 1.39.11 = "1.42.4" ] && \
+		sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \
+			composer.json; \
 	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	chown -R www-data:www-data extensions skins cache images; \
diff --git a/mediawiki_stable-fpm/Dockerfile b/mediawiki_1.39-fpm/Dockerfile
similarity index 87%
rename from mediawiki_stable-fpm/Dockerfile
rename to mediawiki_1.39-fpm/Dockerfile
index 42d0101..316a53f 100644
--- a/mediawiki_stable-fpm/Dockerfile
+++ b/mediawiki_1.39-fpm/Dockerfile
@@ -71,8 +71,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.42
-ENV MEDIAWIKI_VERSION 1.42.4
+ENV MEDIAWIKI_MAJOR_VERSION 1.39
+ENV MEDIAWIKI_VERSION 1.39.11
 
 # MediaWiki setup
 RUN set -eux; \
@@ -86,15 +86,12 @@ RUN set -eux; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://www.mediawiki.org/keys/keys.txt
-	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \
-		D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \
-		441276E9CCD15F44F6D97D18C119E1A64D70938E \
-		F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \
-		1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \
-	; \
+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
 	gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	tar -x --strip-components=1 -f mediawiki.tar.gz; \
+	[ 1.39.11 = "1.42.4" ] && \
+		sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \
+			composer.json; \
 	gpgconf --kill all; \
 	rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	chown -R www-data:www-data extensions skins cache images; \
diff --git a/mediawiki_latest/Dockerfile b/mediawiki_1.39/Dockerfile
similarity index 89%
rename from mediawiki_latest/Dockerfile
rename to mediawiki_1.39/Dockerfile
index d310834..33f6fb6 100644
--- a/mediawiki_latest/Dockerfile
+++ b/mediawiki_1.39/Dockerfile
@@ -86,8 +86,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.42
-ENV MEDIAWIKI_VERSION 1.42.4
+ENV MEDIAWIKI_MAJOR_VERSION 1.39
+ENV MEDIAWIKI_VERSION 1.39.11
 
 # MediaWiki setup
 RUN set -eux; \
@@ -101,15 +101,12 @@ RUN set -eux; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://www.mediawiki.org/keys/keys.txt
-	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \
-		D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \
-		441276E9CCD15F44F6D97D18C119E1A64D70938E \
-		F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \
-		1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \
-	; \
+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
 	gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	tar -x --strip-components=1 -f mediawiki.tar.gz; \
+	[ 1.39.11 = "1.42.4" ] && \
+		sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \
+			composer.json; \
 	gpgconf --kill all; \
 	rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	chown -R www-data:www-data extensions skins cache images; \
diff --git a/mediawiki_legacy-fpm-alpine/Dockerfile b/mediawiki_legacy-fpm-alpine/Dockerfile
index 9e6aa7a..6f6a7b3 100644
--- a/mediawiki_legacy-fpm-alpine/Dockerfile
+++ b/mediawiki_legacy-fpm-alpine/Dockerfile
@@ -61,8 +61,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.41
-ENV MEDIAWIKI_VERSION 1.41.5
+ENV MEDIAWIKI_MAJOR_VERSION 1.42
+ENV MEDIAWIKI_VERSION 1.42.4
 
 # MediaWiki setup
 RUN set -eux; \
@@ -74,15 +74,12 @@ RUN set -eux; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://www.mediawiki.org/keys/keys.txt
-	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \
-		D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \
-		441276E9CCD15F44F6D97D18C119E1A64D70938E \
-		F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \
-		1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \
-	; \
+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
 	gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	tar -x --strip-components=1 -f mediawiki.tar.gz; \
+	[ 1.42.4 = "1.42.4" ] && \
+		sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \
+			composer.json; \
 	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	chown -R www-data:www-data extensions skins cache images; \
diff --git a/mediawiki_legacy-fpm/Dockerfile b/mediawiki_legacy-fpm/Dockerfile
index 7571323..4ca76e9 100644
--- a/mediawiki_legacy-fpm/Dockerfile
+++ b/mediawiki_legacy-fpm/Dockerfile
@@ -71,8 +71,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.41
-ENV MEDIAWIKI_VERSION 1.41.5
+ENV MEDIAWIKI_MAJOR_VERSION 1.42
+ENV MEDIAWIKI_VERSION 1.42.4
 
 # MediaWiki setup
 RUN set -eux; \
@@ -86,15 +86,12 @@ RUN set -eux; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://www.mediawiki.org/keys/keys.txt
-	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \
-		D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \
-		441276E9CCD15F44F6D97D18C119E1A64D70938E \
-		F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \
-		1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \
-	; \
+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
 	gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	tar -x --strip-components=1 -f mediawiki.tar.gz; \
+	[ 1.42.4 = "1.42.4" ] && \
+		sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \
+			composer.json; \
 	gpgconf --kill all; \
 	rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	chown -R www-data:www-data extensions skins cache images; \
diff --git a/mediawiki_legacy/Dockerfile b/mediawiki_legacy/Dockerfile
index 3a2e70f..54e98e0 100644
--- a/mediawiki_legacy/Dockerfile
+++ b/mediawiki_legacy/Dockerfile
@@ -86,8 +86,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.41
-ENV MEDIAWIKI_VERSION 1.41.5
+ENV MEDIAWIKI_MAJOR_VERSION 1.42
+ENV MEDIAWIKI_VERSION 1.42.4
 
 # MediaWiki setup
 RUN set -eux; \
@@ -101,15 +101,12 @@ RUN set -eux; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://www.mediawiki.org/keys/keys.txt
-	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \
-		D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \
-		441276E9CCD15F44F6D97D18C119E1A64D70938E \
-		F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \
-		1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \
-	; \
+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
 	gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	tar -x --strip-components=1 -f mediawiki.tar.gz; \
+	[ 1.42.4 = "1.42.4" ] && \
+		sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \
+			composer.json; \
 	gpgconf --kill all; \
 	rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	chown -R www-data:www-data extensions skins cache images; \
diff --git a/mediawiki_lts-fpm-alpine/Dockerfile b/mediawiki_lts-fpm-alpine/Dockerfile
index d419fb2..440efdb 100644
--- a/mediawiki_lts-fpm-alpine/Dockerfile
+++ b/mediawiki_lts-fpm-alpine/Dockerfile
@@ -61,8 +61,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.39
-ENV MEDIAWIKI_VERSION 1.39.11
+ENV MEDIAWIKI_MAJOR_VERSION 1.43
+ENV MEDIAWIKI_VERSION 1.43.0
 
 # MediaWiki setup
 RUN set -eux; \
@@ -74,15 +74,12 @@ RUN set -eux; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://www.mediawiki.org/keys/keys.txt
-	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \
-		D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \
-		441276E9CCD15F44F6D97D18C119E1A64D70938E \
-		F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \
-		1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \
-	; \
+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
 	gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	tar -x --strip-components=1 -f mediawiki.tar.gz; \
+	[ 1.43.0 = "1.42.4" ] && \
+		sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \
+			composer.json; \
 	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	chown -R www-data:www-data extensions skins cache images; \
diff --git a/mediawiki_lts-fpm/Dockerfile b/mediawiki_lts-fpm/Dockerfile
index ef75eb6..a4a1dc7 100644
--- a/mediawiki_lts-fpm/Dockerfile
+++ b/mediawiki_lts-fpm/Dockerfile
@@ -71,8 +71,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.39
-ENV MEDIAWIKI_VERSION 1.39.11
+ENV MEDIAWIKI_MAJOR_VERSION 1.43
+ENV MEDIAWIKI_VERSION 1.43.0
 
 # MediaWiki setup
 RUN set -eux; \
@@ -86,15 +86,12 @@ RUN set -eux; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://www.mediawiki.org/keys/keys.txt
-	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \
-		D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \
-		441276E9CCD15F44F6D97D18C119E1A64D70938E \
-		F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \
-		1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \
-	; \
+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
 	gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	tar -x --strip-components=1 -f mediawiki.tar.gz; \
+	[ 1.43.0 = "1.42.4" ] && \
+		sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \
+			composer.json; \
 	gpgconf --kill all; \
 	rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	chown -R www-data:www-data extensions skins cache images; \
diff --git a/mediawiki_lts/Dockerfile b/mediawiki_lts/Dockerfile
index 6e87535..7690a44 100644
--- a/mediawiki_lts/Dockerfile
+++ b/mediawiki_lts/Dockerfile
@@ -86,8 +86,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.39
-ENV MEDIAWIKI_VERSION 1.39.11
+ENV MEDIAWIKI_MAJOR_VERSION 1.43
+ENV MEDIAWIKI_VERSION 1.43.0
 
 # MediaWiki setup
 RUN set -eux; \
@@ -101,15 +101,12 @@ RUN set -eux; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
 	curl -fSL "https://releases.wikimedia.org/mediawiki/${MEDIAWIKI_MAJOR_VERSION}/mediawiki-${MEDIAWIKI_VERSION}.tar.gz.sig" -o mediawiki.tar.gz.sig; \
 	export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://www.mediawiki.org/keys/keys.txt
-	gpg --batch --keyserver keyserver.ubuntu.com --recv-keys \
-		D7D6767D135A514BEB86E9BA75682B08E8A3FEC4 \
-		441276E9CCD15F44F6D97D18C119E1A64D70938E \
-		F7F780D82EBFB8A56556E7EE82403E59F9F8CD79 \
-		1D98867E82982C8FE0ABC25F9B69B3109D3BB7B0 \
-	; \
+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
 	gpg --batch --verify mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	tar -x --strip-components=1 -f mediawiki.tar.gz; \
+	[ 1.43.0 = "1.42.4" ] && \
+		sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \
+			composer.json; \
 	gpgconf --kill all; \
 	rm -r "$GNUPGHOME" mediawiki.tar.gz.sig mediawiki.tar.gz; \
 	chown -R www-data:www-data extensions skins cache images; \

Relevant Maintainers:

mediawiki: @legoktm @addshore @christian-heusel

christian-heusel · 2025-01-06T13:38:59Z

@tianon @yosifkit @LaurentGoderre friendly ping, could we get this reviewed & merged? 😊

tianon · 2025-01-07T19:57:14Z

Apologies for the delay (holiday PTO 🙈).

+	gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \

Unfortunately, this is not acceptable -- the specific keys need to be verified in some way (checksum or full fingerprint). See docker-library/tomcat#327 for an approach that might be reasonable in your case (essentially: download the keys, import them, export specific keys via full fingerprint, wipe, import exported keys, verify).

Another reasonable alternative (depending on what problem this change is trying to solve) would be to swap to the https://keys.openpgp.org/ keyserver, which is very reliable, but has the added requirement that key holders verify their email addresses (for GDPR compliance).

fix 1.42.4 update script, add 1.43.0, remove EOL 1.41

d711ed4

Link to our PR wikimedia/mediawiki-docker#152 Signed-off-by: Christian Heusel <[email protected]>

christian-heusel requested a review from a team as a code owner December 28, 2024 10:26

github-actions bot added the library/mediawiki label Dec 28, 2024

christian-heusel mentioned this pull request Jan 1, 2025

2024 12 23 mediawiki updates wikimedia/mediawiki-docker#152

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix 1.42.4 update script, add 1.43.0, remove EOL 1.41 #18170

fix 1.42.4 update script, add 1.43.0, remove EOL 1.41 #18170

christian-heusel commented Dec 28, 2024

github-actions bot commented Dec 28, 2024

christian-heusel commented Jan 6, 2025

tianon commented Jan 7, 2025

fix 1.42.4 update script, add 1.43.0, remove EOL 1.41 #18170

Are you sure you want to change the base?

fix 1.42.4 update script, add 1.43.0, remove EOL 1.41 #18170

Conversation

christian-heusel commented Dec 28, 2024

github-actions bot commented Dec 28, 2024

christian-heusel commented Jan 6, 2025

tianon commented Jan 7, 2025