From c91cb64bba8c5a12ee5b66025d881b4619214681 Mon Sep 17 00:00:00 2001 From: Cool updating bot Date: Tue, 4 Feb 2025 00:23:18 +0000 Subject: [PATCH 1/2] Update to 1.42.5 --- 1.42/apache/Dockerfile | 4 ++-- 1.42/fpm-alpine/Dockerfile | 4 ++-- 1.42/fpm/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/1.42/apache/Dockerfile b/1.42/apache/Dockerfile index 41d950d..ac23700 100644 --- a/1.42/apache/Dockerfile +++ b/1.42/apache/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,7 +111,7 @@ 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" ] && \ + [ 1.42.5 = "1.42.4" ] && \ sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ composer.json; \ gpgconf --kill all; \ diff --git a/1.42/fpm-alpine/Dockerfile b/1.42/fpm-alpine/Dockerfile index 45497a8..087177e 100644 --- a/1.42/fpm-alpine/Dockerfile +++ b/1.42/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,7 +84,7 @@ 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" ] && \ + [ 1.42.5 = "1.42.4" ] && \ sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ composer.json; \ gpgconf --kill all; \ diff --git a/1.42/fpm/Dockerfile b/1.42/fpm/Dockerfile index a0bbf14..aa4d6a9 100644 --- a/1.42/fpm/Dockerfile +++ b/1.42/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,7 +96,7 @@ 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" ] && \ + [ 1.42.5 = "1.42.4" ] && \ sed -i 's|wikimedia/parsoid": "0.19.0"|wikimedia/parsoid": "0.19.1"|' \ composer.json; \ gpgconf --kill all; \ From 3ff5d35ab3071e106a7ab64416bb76531452add9 Mon Sep 17 00:00:00 2001 From: Christian Heusel Date: Tue, 4 Feb 2025 11:38:24 +0100 Subject: [PATCH 2/2] Remove hotfix for missing change to composer.json --- 1.39/apache/Dockerfile | 3 --- 1.39/fpm-alpine/Dockerfile | 3 --- 1.39/fpm/Dockerfile | 3 --- 1.42/apache/Dockerfile | 3 --- 1.42/fpm-alpine/Dockerfile | 3 --- 1.42/fpm/Dockerfile | 3 --- 1.43/apache/Dockerfile | 3 --- 1.43/fpm-alpine/Dockerfile | 3 --- 1.43/fpm/Dockerfile | 3 --- Dockerfile-alpine.template | 3 --- Dockerfile-debian.template | 3 --- 11 files changed, 33 deletions(-) diff --git a/1.39/apache/Dockerfile b/1.39/apache/Dockerfile index 20a9f1f..c8b3699 100644 --- a/1.39/apache/Dockerfile +++ b/1.39/apache/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/1.39/fpm-alpine/Dockerfile b/1.39/fpm-alpine/Dockerfile index bfa4d68..dc79935 100644 --- a/1.39/fpm-alpine/Dockerfile +++ b/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/1.39/fpm/Dockerfile b/1.39/fpm/Dockerfile index 888ff4f..deb6edc 100644 --- a/1.39/fpm/Dockerfile +++ b/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/1.42/apache/Dockerfile b/1.42/apache/Dockerfile index ac23700..22023ca 100644 --- a/1.42/apache/Dockerfile +++ b/1.42/apache/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.42.5 = "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/1.42/fpm-alpine/Dockerfile b/1.42/fpm-alpine/Dockerfile index 087177e..ca01044 100644 --- a/1.42/fpm-alpine/Dockerfile +++ b/1.42/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.42.5 = "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/1.42/fpm/Dockerfile b/1.42/fpm/Dockerfile index aa4d6a9..6f78389 100644 --- a/1.42/fpm/Dockerfile +++ b/1.42/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.42.5 = "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/1.43/apache/Dockerfile b/1.43/apache/Dockerfile index 0e4b87c..25e26f0 100644 --- a/1.43/apache/Dockerfile +++ b/1.43/apache/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; \ diff --git a/1.43/fpm-alpine/Dockerfile b/1.43/fpm-alpine/Dockerfile index 00036c2..1b8cc3b 100644 --- a/1.43/fpm-alpine/Dockerfile +++ b/1.43/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/1.43/fpm/Dockerfile b/1.43/fpm/Dockerfile index 8143e60..47a52a1 100644 --- a/1.43/fpm/Dockerfile +++ b/1.43/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/Dockerfile-alpine.template b/Dockerfile-alpine.template index df70498..554e269 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -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; \ - [ %%MEDIAWIKI_VERSION%% = "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/Dockerfile-debian.template b/Dockerfile-debian.template index c5baefd..34c8471 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -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; \ - [ %%MEDIAWIKI_VERSION%% = "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; \