Merge branch 'main' into T399704-deploy-local-compose-overrides

Author: lorenjohnson

build/wikibase/Dockerfile

@@ -98,9 +98,10 @@ RUN { \
 # MediaWiki setup
 WORKDIR /var/www/html
 ARG MEDIAWIKI_VERSION
+# Set the user agent as releases.wikimedia.org will 403 us otherwise
 # hadolint ignore=DL4006
 RUN set -eux; \
-    curl -fSL "https://releases.wikimedia.org/mediawiki/$(echo ${MEDIAWIKI_VERSION} | cut -d. -f1,2)/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
+    curl -A "Mozilla/5.0" -fSL "https://releases.wikimedia.org/mediawiki/$(echo ${MEDIAWIKI_VERSION} | cut -d. -f1,2)/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \
     tar -x --strip-components=1 -f mediawiki.tar.gz; \
     rm -r mediawiki.tar.gz; \
     install -d /var/log/mediawiki -o www-data

deploy/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 5.0.1 (2025-08-26)
+
+
+### 🩹 Fixes
+
+- bump wikbase container to 5
+
 # 5.0.0 (2025-07-24)
 
 

deploy/docker-compose.yml

@@ -6,7 +6,7 @@ services:
   # --------------------------------------------------
 
   wikibase:
-    image: wikibase/wikibase:4
+    image: wikibase/wikibase:5
     depends_on:
       mysql:
         condition: service_healthy
@@ -39,7 +39,7 @@ services:
       start_period: 5m
 
   wikibase-jobrunner:
-    image: wikibase/wikibase:4
+    image: wikibase/wikibase:5
     command: /jobrunner-entrypoint.sh
     depends_on:
       wikibase:

deploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "deploy",
-	"version": "5.0.0",
+	"version": "5.0.1",
 	"nx": {
 		"targets": {
 			"lint": {},

lint.sh

@@ -25,6 +25,7 @@ usage() {
 }
 
 # Error handler to capture errors
+# shellcheck disable=SC2329 # spell check does not see the usage in the trap
 error_handler() {
   # shellcheck disable=SC2317
   exit_code=1