-
Notifications
You must be signed in to change notification settings - Fork 2.5k
mediawiki: Add 1.39, drop 1.37, switch to PHP 8 #13655
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 1.39.0 is now the new "stable" and "lts" using PHP 8.1 * 1.38 is now "legacy" * 1.37 is EOL and removed * The remaining images are now based on PHP 8.0 See: * wikimedia/mediawiki-docker#116 * wikimedia/mediawiki-docker#117
Diff for f5fe144:diff --git a/_bashbrew-cat b/_bashbrew-cat
index f8cc3f8..49d08dd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,34 +1,34 @@
Maintainers: David Barratt <dbarratt@wikimedia.org> (@davidbarratt), Kunal Mehta <legoktm@debian.org> (@legoktm), addshore <addshorewiki@gmail.com> (@addshore)
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le
GitRepo: https://github.com/wikimedia/mediawiki-docker.git
-GitCommit: 5d098737ac1b1eb8a30a5b8277cd7f3f93a467ea
+GitCommit: fb212193436a531e326bf456cfb3c50b789478fa
-Tags: 1.35.8, 1.35, lts, legacylts
+Tags: 1.35.8, 1.35, legacylts
Directory: 1.35/apache
-Tags: 1.35.8-fpm, 1.35-fpm, lts-fpm, legacylts-fpm
+Tags: 1.35.8-fpm, 1.35-fpm, legacylts-fpm
Directory: 1.35/fpm
-Tags: 1.35.8-fpm-alpine, 1.35-fpm-alpine, lts-fpm-alpine, legacylts-fpm-alpine
+Tags: 1.35.8-fpm-alpine, 1.35-fpm-alpine, legacylts-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
Directory: 1.35/fpm-alpine
-Tags: 1.37.6, 1.37, legacy
-Directory: 1.37/apache
+Tags: 1.38.4, 1.38, legacy
+Directory: 1.38/apache
-Tags: 1.37.6-fpm, 1.37-fpm, legacy-fpm
-Directory: 1.37/fpm
+Tags: 1.38.4-fpm, 1.38-fpm, legacy-fpm
+Directory: 1.38/fpm
-Tags: 1.37.6-fpm-alpine, 1.37-fpm-alpine, legacy-fpm-alpine
+Tags: 1.38.4-fpm-alpine, 1.38-fpm-alpine, legacy-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
-Directory: 1.37/fpm-alpine
+Directory: 1.38/fpm-alpine
-Tags: 1.38.4, 1.38, stable, latest
-Directory: 1.38/apache
+Tags: 1.39.0, 1.39, stable, lts, latest
+Directory: 1.39/apache
-Tags: 1.38.4-fpm, 1.38-fpm, stable-fpm
-Directory: 1.38/fpm
+Tags: 1.39.0-fpm, 1.39-fpm, stable-fpm, lts-fpm
+Directory: 1.39/fpm
-Tags: 1.38.4-fpm-alpine, 1.38-fpm-alpine, stable-fpm-alpine
+Tags: 1.39.0-fpm-alpine, 1.39-fpm-alpine, stable-fpm-alpine, lts-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le
-Directory: 1.38/fpm-alpine
+Directory: 1.39/fpm-alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 2674b33..0a12e81 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,18 +4,18 @@ mediawiki:1.35-fpm-alpine
mediawiki:1.35.8
mediawiki:1.35.8-fpm
mediawiki:1.35.8-fpm-alpine
-mediawiki:1.37
-mediawiki:1.37-fpm
-mediawiki:1.37-fpm-alpine
-mediawiki:1.37.6
-mediawiki:1.37.6-fpm
-mediawiki:1.37.6-fpm-alpine
mediawiki:1.38
mediawiki:1.38-fpm
mediawiki:1.38-fpm-alpine
mediawiki:1.38.4
mediawiki:1.38.4-fpm
mediawiki:1.38.4-fpm-alpine
+mediawiki:1.39
+mediawiki:1.39-fpm
+mediawiki:1.39-fpm-alpine
+mediawiki:1.39.0
+mediawiki:1.39.0-fpm
+mediawiki:1.39.0-fpm-alpine
mediawiki:latest
mediawiki:legacy
mediawiki:legacylts
diff --git a/mediawiki_latest/Dockerfile b/mediawiki_latest/Dockerfile
index 39d1c68..e63ffe1 100644
--- a/mediawiki_latest/Dockerfile
+++ b/mediawiki_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-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.38
-ENV MEDIAWIKI_VERSION 1.38.4
+ENV MEDIAWIKI_MAJOR_VERSION 1.39
+ENV MEDIAWIKI_VERSION 1.39.0
# MediaWiki setup
RUN set -eux; \
diff --git a/mediawiki_legacy-fpm-alpine/Dockerfile b/mediawiki_legacy-fpm-alpine/Dockerfile
index d9294eb..1b24b9f 100644
--- a/mediawiki_legacy-fpm-alpine/Dockerfile
+++ b/mediawiki_legacy-fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine
+FROM php:8.0-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.37
-ENV MEDIAWIKI_VERSION 1.37.6
+ENV MEDIAWIKI_MAJOR_VERSION 1.38
+ENV MEDIAWIKI_VERSION 1.38.4
# MediaWiki setup
RUN set -eux; \
diff --git a/mediawiki_legacy-fpm/Dockerfile b/mediawiki_legacy-fpm/Dockerfile
index 4e061e4..70407c5 100644
--- a/mediawiki_legacy-fpm/Dockerfile
+++ b/mediawiki_legacy-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.0-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.37
-ENV MEDIAWIKI_VERSION 1.37.6
+ENV MEDIAWIKI_MAJOR_VERSION 1.38
+ENV MEDIAWIKI_VERSION 1.38.4
# MediaWiki setup
RUN set -eux; \
diff --git a/mediawiki_legacy/Dockerfile b/mediawiki_legacy/Dockerfile
index e48969d..7ea66e0 100644
--- a/mediawiki_legacy/Dockerfile
+++ b/mediawiki_legacy/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM php:8.0-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.37
-ENV MEDIAWIKI_VERSION 1.37.6
+ENV MEDIAWIKI_MAJOR_VERSION 1.38
+ENV MEDIAWIKI_VERSION 1.38.4
# MediaWiki setup
RUN set -eux; \
diff --git a/mediawiki_legacylts-fpm-alpine/Dockerfile b/mediawiki_legacylts-fpm-alpine/Dockerfile
index 8891888..14a9fad 100644
--- a/mediawiki_legacylts-fpm-alpine/Dockerfile
+++ b/mediawiki_legacylts-fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine
+FROM php:8.0-fpm-alpine
# System dependencies
RUN set -eux; \
diff --git a/mediawiki_legacylts-fpm/Dockerfile b/mediawiki_legacylts-fpm/Dockerfile
index f3bfe51..8df67de 100644
--- a/mediawiki_legacylts-fpm/Dockerfile
+++ b/mediawiki_legacylts-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.0-fpm
# System dependencies
RUN set -eux; \
diff --git a/mediawiki_legacylts/Dockerfile b/mediawiki_legacylts/Dockerfile
index 9ec33ca..5fdf32f 100644
--- a/mediawiki_legacylts/Dockerfile
+++ b/mediawiki_legacylts/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM php:8.0-apache
# System dependencies
RUN set -eux; \
diff --git a/mediawiki_stable-fpm-alpine/Dockerfile b/mediawiki_lts-fpm-alpine/Dockerfile
similarity index 96%
rename from mediawiki_stable-fpm-alpine/Dockerfile
rename to mediawiki_lts-fpm-alpine/Dockerfile
index 181aa9b..5a220ae 100644
--- a/mediawiki_stable-fpm-alpine/Dockerfile
+++ b/mediawiki_lts-fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-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.38
-ENV MEDIAWIKI_VERSION 1.38.4
+ENV MEDIAWIKI_MAJOR_VERSION 1.39
+ENV MEDIAWIKI_VERSION 1.39.0
# MediaWiki setup
RUN set -eux; \
diff --git a/mediawiki_stable-fpm/Dockerfile b/mediawiki_lts-fpm/Dockerfile
similarity index 97%
rename from mediawiki_stable-fpm/Dockerfile
rename to mediawiki_lts-fpm/Dockerfile
index 4b248b0..57c67c1 100644
--- a/mediawiki_stable-fpm/Dockerfile
+++ b/mediawiki_lts-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-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.38
-ENV MEDIAWIKI_VERSION 1.38.4
+ENV MEDIAWIKI_MAJOR_VERSION 1.39
+ENV MEDIAWIKI_VERSION 1.39.0
# MediaWiki setup
RUN set -eux; \Relevant Maintainers:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See: