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

Drop the EOL Mediawik 1.40 #17078

Merged

Conversation

@christian-heusel christian-heusel requested a review from a team as a code owner June 28, 2024 20:46
Copy link

Diff for 4b69b68:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e368e64..b9b6cff 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: ac216d3fa6d11d3d79c9ddabf55950b05ccf8b08
+GitCommit: b3b4ecdcb503a180b1f5052b04963a0fb93f6611
 
 Tags: 1.39.8, 1.39, lts
 Directory: 1.39/apache
@@ -14,16 +14,6 @@ Tags: 1.39.8-fpm-alpine, 1.39-fpm-alpine, lts-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
 Directory: 1.39/fpm-alpine
 
-Tags: 1.40.4, 1.40
-Directory: 1.40/apache
-
-Tags: 1.40.4-fpm, 1.40-fpm
-Directory: 1.40/fpm
-
-Tags: 1.40.4-fpm-alpine, 1.40-fpm-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
-Directory: 1.40/fpm-alpine
-
 Tags: 1.41.2, 1.41, legacy
 Directory: 1.41/apache
 
diff --git a/_bashbrew-list b/_bashbrew-list
index 3ce76a1..5dadc78 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,12 +4,6 @@ mediawiki:1.39-fpm-alpine
 mediawiki:1.39.8
 mediawiki:1.39.8-fpm
 mediawiki:1.39.8-fpm-alpine
-mediawiki:1.40
-mediawiki:1.40-fpm
-mediawiki:1.40-fpm-alpine
-mediawiki:1.40.4
-mediawiki:1.40.4-fpm
-mediawiki:1.40.4-fpm-alpine
 mediawiki:1.41
 mediawiki:1.41-fpm
 mediawiki:1.41-fpm-alpine
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 095aa21..6a1545d 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,3 @@
-mediawiki:1.40
-mediawiki:1.40-fpm
-mediawiki:1.40-fpm-alpine
 mediawiki:latest
 mediawiki:legacy
 mediawiki:legacy-fpm
diff --git a/mediawiki_1.40-fpm-alpine/Dockerfile b/mediawiki_1.40-fpm-alpine/Dockerfile
deleted file mode 100644
index 08c99b9..0000000
diff --git a/mediawiki_1.40-fpm/Dockerfile b/mediawiki_1.40-fpm/Dockerfile
deleted file mode 100644
index 833a027..0000000
diff --git a/mediawiki_1.40/Dockerfile b/mediawiki_1.40/Dockerfile
deleted file mode 100644
index 519950f..0000000
diff --git a/mediawiki_latest/Dockerfile b/mediawiki_latest/Dockerfile
index 00a21f5..048cfcf 100644
--- a/mediawiki_latest/Dockerfile
+++ b/mediawiki_latest/Dockerfile
@@ -32,7 +32,7 @@ RUN set -eux; \
 		opcache \
 	; \
 	\
-	pecl install APCu-5.1.21; \
+	pecl install APCu-5.1.23; \
 	docker-php-ext-enable \
 		apcu \
 	; \
diff --git a/mediawiki_stable-fpm-alpine/Dockerfile b/mediawiki_stable-fpm-alpine/Dockerfile
index c3abab2..f8bff45 100644
--- a/mediawiki_stable-fpm-alpine/Dockerfile
+++ b/mediawiki_stable-fpm-alpine/Dockerfile
@@ -27,7 +27,7 @@ RUN set -eux; \
 		opcache \
 	; \
 	\
-	pecl install APCu-5.1.21; \
+	pecl install APCu-5.1.23; \
 	docker-php-ext-enable \
 		apcu \
 	; \
diff --git a/mediawiki_stable-fpm/Dockerfile b/mediawiki_stable-fpm/Dockerfile
index e58964a..04602b5 100644
--- a/mediawiki_stable-fpm/Dockerfile
+++ b/mediawiki_stable-fpm/Dockerfile
@@ -32,7 +32,7 @@ RUN set -eux; \
 		opcache \
 	; \
 	\
-	pecl install APCu-5.1.21; \
+	pecl install APCu-5.1.23; \
 	docker-php-ext-enable \
 		apcu \
 	; \

Relevant Maintainers:

@tianon tianon merged commit 1d0e516 into docker-library:master Jun 28, 2024
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