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.

Sign up for GitHub

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

Jump to bottom

Update Mediawiki to version 1.41 #15966

Merged
merged 2 commits into from
Dec 24, 2023
Merged

Update Mediawiki to version 1.41 #15966

merged 2 commits into from
Dec 24, 2023

Conversation

christian-heusel
Copy link
Contributor

@christian-heusel christian-heusel commented Dec 23, 2023 •
edited
Loading

Also includes the new point releases 1.40.2 / 1.39.6

Announcements:

@christian-heusel
1.41 is the new stable release, shifting 1.40 to legacy.
c87de7e 
Also include the new point releases 1.40.2 / 1.39.6 / 1.35.14

Signed-off-by: Christian Heusel <[email protected]>
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions
Copy link

Diff for 5174f87: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index f23a968..15d6946 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: fdf347f62615dad789d0e703fc2f6d628c43d4e1
+GitCommit: 28d34a71bac948ce1f46cd801e512e6a69c9b467
 
-Tags: 1.35.13, 1.35, legacylts
-Directory: 1.35/apache
-
-Tags: 1.35.13-fpm, 1.35-fpm, legacylts-fpm
-Directory: 1.35/fpm
-
-Tags: 1.35.13-fpm-alpine, 1.35-fpm-alpine, legacylts-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
-Directory: 1.35/fpm-alpine
-
-Tags: 1.39.5, 1.39, lts, legacy
+Tags: 1.39.6, 1.39, lts
 Directory: 1.39/apache
 
-Tags: 1.39.5-fpm, 1.39-fpm, legacy-fpm, lts-fpm
+Tags: 1.39.6-fpm, 1.39-fpm, lts-fpm
 Directory: 1.39/fpm
 
-Tags: 1.39.5-fpm-alpine, 1.39-fpm-alpine, legacy-fpm-alpine, lts-fpm-alpine
+Tags: 1.39.6-fpm-alpine, 1.39-fpm-alpine, lts-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 Directory: 1.39/fpm-alpine
 
-Tags: 1.40.1, 1.40, stable, latest
+Tags: 1.40.2, 1.40, legacy
 Directory: 1.40/apache
 
-Tags: 1.40.1-fpm, 1.40-fpm, stable-fpm
+Tags: 1.40.2-fpm, 1.40-fpm, legacy-fpm
 Directory: 1.40/fpm
 
-Tags: 1.40.1-fpm-alpine, 1.40-fpm-alpine, stable-fpm-alpine
+Tags: 1.40.2-fpm-alpine, 1.40-fpm-alpine, legacy-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 Directory: 1.40/fpm-alpine
+
+Tags: 1.41.0, 1.41, stable, latest
+Directory: 1.41/apache
+
+Tags: 1.41.0-fpm, 1.41-fpm, stable-fpm
+Directory: 1.41/fpm
+
+Tags: 1.41.0-fpm-alpine, 1.41-fpm-alpine, stable-fpm-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
+Directory: 1.41/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index a2b3645..fa4053d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,26 +1,23 @@
-mediawiki:1.35
-mediawiki:1.35-fpm
-mediawiki:1.35-fpm-alpine
-mediawiki:1.35.13
-mediawiki:1.35.13-fpm
-mediawiki:1.35.13-fpm-alpine
 mediawiki:1.39
 mediawiki:1.39-fpm
 mediawiki:1.39-fpm-alpine
-mediawiki:1.39.5
-mediawiki:1.39.5-fpm
-mediawiki:1.39.5-fpm-alpine
+mediawiki:1.39.6
+mediawiki:1.39.6-fpm
+mediawiki:1.39.6-fpm-alpine
 mediawiki:1.40
 mediawiki:1.40-fpm
 mediawiki:1.40-fpm-alpine
-mediawiki:1.40.1
-mediawiki:1.40.1-fpm
-mediawiki:1.40.1-fpm-alpine
+mediawiki:1.40.2
+mediawiki:1.40.2-fpm
+mediawiki:1.40.2-fpm-alpine
+mediawiki:1.41
+mediawiki:1.41-fpm
+mediawiki:1.41-fpm-alpine
+mediawiki:1.41.0
+mediawiki:1.41.0-fpm
+mediawiki:1.41.0-fpm-alpine
 mediawiki:latest
 mediawiki:legacy
-mediawiki:legacylts
-mediawiki:legacylts-fpm
-mediawiki:legacylts-fpm-alpine
 mediawiki:legacy-fpm
 mediawiki:legacy-fpm-alpine
 mediawiki:lts
diff --git a/mediawiki_latest/Dockerfile b/mediawiki_latest/Dockerfile
index 5777d20..9844442 100644
--- a/mediawiki_latest/Dockerfile
+++ b/mediawiki_latest/Dockerfile
@@ -83,8 +83,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.40
-ENV MEDIAWIKI_VERSION 1.40.1
+ENV MEDIAWIKI_MAJOR_VERSION 1.41
+ENV MEDIAWIKI_VERSION 1.41.0
 
 # MediaWiki setup
 RUN set -eux; \
diff --git a/mediawiki_legacylts-fpm-alpine/Dockerfile b/mediawiki_legacy-fpm-alpine/Dockerfile
similarity index 96%
rename from mediawiki_legacylts-fpm-alpine/Dockerfile
rename to mediawiki_legacy-fpm-alpine/Dockerfile
index 4a20748..b46f9ac 100644
--- a/mediawiki_legacylts-fpm-alpine/Dockerfile
+++ b/mediawiki_legacy-fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-fpm-alpine
+FROM php:8.1-fpm-alpine
 
 # System dependencies
 RUN set -eux; \
@@ -58,8 +58,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.35
-ENV MEDIAWIKI_VERSION 1.35.13
+ENV MEDIAWIKI_MAJOR_VERSION 1.40
+ENV MEDIAWIKI_VERSION 1.40.2
 
 # MediaWiki setup
 RUN set -eux; \
diff --git a/mediawiki_legacylts-fpm/Dockerfile b/mediawiki_legacy-fpm/Dockerfile
similarity index 97%
rename from mediawiki_legacylts-fpm/Dockerfile
rename to mediawiki_legacy-fpm/Dockerfile
index 5c025bf..201c7aa 100644
--- a/mediawiki_legacylts-fpm/Dockerfile
+++ b/mediawiki_legacy-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-fpm
+FROM php:8.1-fpm
 
 # System dependencies
 RUN set -eux; \
@@ -68,8 +68,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.35
-ENV MEDIAWIKI_VERSION 1.35.13
+ENV MEDIAWIKI_MAJOR_VERSION 1.40
+ENV MEDIAWIKI_VERSION 1.40.2
 
 # MediaWiki setup
 RUN set -eux; \
diff --git a/mediawiki_legacy/Dockerfile b/mediawiki_legacy/Dockerfile
index f9541c6..162e2b0 100644
--- a/mediawiki_legacy/Dockerfile
+++ b/mediawiki_legacy/Dockerfile
@@ -83,8 +83,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.5
+ENV MEDIAWIKI_MAJOR_VERSION 1.40
+ENV MEDIAWIKI_VERSION 1.40.2
 
 # MediaWiki setup
 RUN set -eux; \
diff --git a/mediawiki_lts-fpm-alpine/Dockerfile b/mediawiki_lts-fpm-alpine/Dockerfile
index 626aab3..6ede344 100644
--- a/mediawiki_lts-fpm-alpine/Dockerfile
+++ b/mediawiki_lts-fpm-alpine/Dockerfile
@@ -59,7 +59,7 @@ RUN set -eux; \
 
 # Version
 ENV MEDIAWIKI_MAJOR_VERSION 1.39
-ENV MEDIAWIKI_VERSION 1.39.5
+ENV MEDIAWIKI_VERSION 1.39.6
 
 # MediaWiki setup
 RUN set -eux; \
diff --git a/mediawiki_lts-fpm/Dockerfile b/mediawiki_lts-fpm/Dockerfile
index 75ee0af..cf4947b 100644
--- a/mediawiki_lts-fpm/Dockerfile
+++ b/mediawiki_lts-fpm/Dockerfile
@@ -69,7 +69,7 @@ RUN set -eux; \
 
 # Version
 ENV MEDIAWIKI_MAJOR_VERSION 1.39
-ENV MEDIAWIKI_VERSION 1.39.5
+ENV MEDIAWIKI_VERSION 1.39.6
 
 # MediaWiki setup
 RUN set -eux; \
diff --git a/mediawiki_legacylts/Dockerfile b/mediawiki_lts/Dockerfile
similarity index 97%
rename from mediawiki_legacylts/Dockerfile
rename to mediawiki_lts/Dockerfile
index 1e210b2..9212531 100644
--- a/mediawiki_legacylts/Dockerfile
+++ b/mediawiki_lts/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-apache
+FROM php:8.1-apache
 
 # System dependencies
 RUN set -eux; \
@@ -83,8 +83,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.35
-ENV MEDIAWIKI_VERSION 1.35.13
+ENV MEDIAWIKI_MAJOR_VERSION 1.39
+ENV MEDIAWIKI_VERSION 1.39.6
 
 # MediaWiki setup
 RUN set -eux; \
diff --git a/mediawiki_stable-fpm-alpine/Dockerfile b/mediawiki_stable-fpm-alpine/Dockerfile
index f915cfe..fb9c047 100644
--- a/mediawiki_stable-fpm-alpine/Dockerfile
+++ b/mediawiki_stable-fpm-alpine/Dockerfile
@@ -58,8 +58,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.40
-ENV MEDIAWIKI_VERSION 1.40.1
+ENV MEDIAWIKI_MAJOR_VERSION 1.41
+ENV MEDIAWIKI_VERSION 1.41.0
 
 # MediaWiki setup
 RUN set -eux; \
diff --git a/mediawiki_stable-fpm/Dockerfile b/mediawiki_stable-fpm/Dockerfile
index cf5cab8..67e80d0 100644
--- a/mediawiki_stable-fpm/Dockerfile
+++ b/mediawiki_stable-fpm/Dockerfile
@@ -68,8 +68,8 @@ RUN set -eux; \
 	chown -R www-data:www-data /var/www/data
 
 # Version
-ENV MEDIAWIKI_MAJOR_VERSION 1.40
-ENV MEDIAWIKI_VERSION 1.40.1
+ENV MEDIAWIKI_MAJOR_VERSION 1.41
+ENV MEDIAWIKI_VERSION 1.41.0
 
 # MediaWiki setup
 RUN set -eux; \

Relevant Maintainers:

@christian-heusel
Copy link
Contributor Author

I wanted to publish the point release for Mediawiki 1.35 for completeness sake, but as this builds on the deprecated php8.0 image I have dropped it in the second commit.

@tianon tianon merged commit 51e43c8 into docker-library:master Dec 24, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/mediawiki
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@christian-heusel @tianon