Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MediaWiki 1.42.5 maintenance releases #18369

Merged

Conversation

christian-heusel
Copy link
Contributor

Copy link

github-actions bot commented Feb 4, 2025

Diff for fe28adc:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e115613..003d701 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,7 +2,7 @@ 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: 1be3b2bf0efd0f09e4cf2e706b2ecd92f3680fab
+GitCommit: aa20b593fa1190fa37dcf8a0ccedab375539ee81
 
 Tags: 1.39.11, 1.39
 Directory: 1.39/apache
@@ -14,13 +14,13 @@ Tags: 1.39.11-fpm-alpine, 1.39-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 Directory: 1.39/fpm-alpine
 
-Tags: 1.42.4, 1.42, legacy
+Tags: 1.42.5, 1.42, legacy
 Directory: 1.42/apache
 
-Tags: 1.42.4-fpm, 1.42-fpm, legacy-fpm
+Tags: 1.42.5-fpm, 1.42-fpm, legacy-fpm
 Directory: 1.42/fpm
 
-Tags: 1.42.4-fpm-alpine, 1.42-fpm-alpine, legacy-fpm-alpine
+Tags: 1.42.5-fpm-alpine, 1.42-fpm-alpine, legacy-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 Directory: 1.42/fpm-alpine
 
diff --git a/_bashbrew-list b/_bashbrew-list
index 7367342..14fdcc9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -7,9 +7,9 @@ mediawiki:1.39.11-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.42.5
+mediawiki:1.42.5-fpm
+mediawiki:1.42.5-fpm-alpine
 mediawiki:1.43
 mediawiki:1.43-fpm
 mediawiki:1.43-fpm-alpine
diff --git a/mediawiki_1.39-fpm-alpine/Dockerfile b/mediawiki_1.39-fpm-alpine/Dockerfile
index bfa4d68..dc79935 100644
--- a/mediawiki_1.39-fpm-alpine/Dockerfile
+++ b/mediawiki_1.39-fpm-alpine/Dockerfile
@@ -84,9 +84,6 @@ RUN set -eux; \
 	; \
 	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_1.39-fpm/Dockerfile b/mediawiki_1.39-fpm/Dockerfile
index 888ff4f..deb6edc 100644
--- a/mediawiki_1.39-fpm/Dockerfile
+++ b/mediawiki_1.39-fpm/Dockerfile
@@ -96,9 +96,6 @@ RUN set -eux; \
 	; \
 	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_1.39/Dockerfile b/mediawiki_1.39/Dockerfile
index 20a9f1f..c8b3699 100644
--- a/mediawiki_1.39/Dockerfile
+++ b/mediawiki_1.39/Dockerfile
@@ -111,9 +111,6 @@ RUN set -eux; \
 	; \
 	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 45497a8..ca01044 100644
--- a/mediawiki_legacy-fpm-alpine/Dockerfile
+++ b/mediawiki_legacy-fpm-alpine/Dockerfile
@@ -62,7 +62,7 @@ RUN set -eux; \
 
 # Version
 ENV MEDIAWIKI_MAJOR_VERSION 1.42
-ENV MEDIAWIKI_VERSION 1.42.4
+ENV MEDIAWIKI_VERSION 1.42.5
 
 # MediaWiki setup
 RUN set -eux; \
@@ -84,9 +84,6 @@ RUN set -eux; \
 	; \
 	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 a0bbf14..6f78389 100644
--- a/mediawiki_legacy-fpm/Dockerfile
+++ b/mediawiki_legacy-fpm/Dockerfile
@@ -72,7 +72,7 @@ RUN set -eux; \
 
 # Version
 ENV MEDIAWIKI_MAJOR_VERSION 1.42
-ENV MEDIAWIKI_VERSION 1.42.4
+ENV MEDIAWIKI_VERSION 1.42.5
 
 # MediaWiki setup
 RUN set -eux; \
@@ -96,9 +96,6 @@ RUN set -eux; \
 	; \
 	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 41d950d..22023ca 100644
--- a/mediawiki_legacy/Dockerfile
+++ b/mediawiki_legacy/Dockerfile
@@ -87,7 +87,7 @@ RUN set -eux; \
 
 # Version
 ENV MEDIAWIKI_MAJOR_VERSION 1.42
-ENV MEDIAWIKI_VERSION 1.42.4
+ENV MEDIAWIKI_VERSION 1.42.5
 
 # MediaWiki setup
 RUN set -eux; \
@@ -111,9 +111,6 @@ RUN set -eux; \
 	; \
 	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 00036c2..1b8cc3b 100644
--- a/mediawiki_lts-fpm-alpine/Dockerfile
+++ b/mediawiki_lts-fpm-alpine/Dockerfile
@@ -84,9 +84,6 @@ RUN set -eux; \
 	; \
 	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 8143e60..47a52a1 100644
--- a/mediawiki_lts-fpm/Dockerfile
+++ b/mediawiki_lts-fpm/Dockerfile
@@ -96,9 +96,6 @@ RUN set -eux; \
 	; \
 	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 0e4b87c..25e26f0 100644
--- a/mediawiki_lts/Dockerfile
+++ b/mediawiki_lts/Dockerfile
@@ -111,9 +111,6 @@ RUN set -eux; \
 	; \
 	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:

@tianon tianon merged commit 5108ca1 into docker-library:master Feb 4, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants