Skip to content

Commit

Permalink
Fix compose.json for MediaWiki 1.42.4
Browse files Browse the repository at this point in the history 
Apparently the [a patch][1] missed the 1.42.4 which causes the
update.php script to fail:

    $ docker compose exec -it mediawiki php /var/www/html/maintenance/run.php update --quick
    MediaWiki 1.42.4 Updater
    wikimedia/parsoid: 0.19.1 installed, 0.19.0 required.
    Error: your composer.lock file is not up to date. Run "composer update --no-dev" to install newer dependencies

Fix this by manually adding the version from the patch as this is more
easily reviewable as compared to applying some random patch.

The code path is included in all docker recipies but only triggers for
the 1.42.4 release and can be removed with the next version.

[1]: https://gerrit.wikimedia.org/r/c/mediawiki/core/+/1082844

Signed-off-by: Christian Heusel <christian@heusel.eu>
  • Loading branch information
@christian-heusel
christian-heusel committed Dec 23, 2024
1 parent e0dbb47 commit e7fdda5
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 0 deletions.
3 changes: 3 additions & 0 deletions 1.39/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down
3 changes: 3 additions & 0 deletions 1.39/fpm-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down
3 changes: 3 additions & 0 deletions 1.39/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down
2 changes: 2 additions & 0 deletions 1.42/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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; \
Expand Down
3 changes: 3 additions & 0 deletions 1.42/fpm-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down
3 changes: 3 additions & 0 deletions 1.42/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down
3 changes: 3 additions & 0 deletions 1.43/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down
3 changes: 3 additions & 0 deletions 1.43/fpm-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down
3 changes: 3 additions & 0 deletions 1.43/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile-debian.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ RUN set -eux; \
gpg --fetch-keys "https://www.mediawiki.org/keys/keys.txt"; \
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"|' \
mediawiki-1.42.4/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; \
Expand Down

0 comments on commit e7fdda5

Please sign in to comment.