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

feat: mw 1.39.10, php8.3, alpine 3.20 #9

Merged
merged 2 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG MEDIAWIKI_VERSION=1.39.7
ARG ALPINE_VERSION=3.19
ARG PHP_VERSION=81
ARG MEDIAWIKI_VERSION=1.39.10
ARG ALPINE_VERSION=3.20
ARG PHP_VERSION=83

# Download mediawiki
FROM alpine:$ALPINE_VERSION as builder
Expand Down
4 changes: 2 additions & 2 deletions config/extension-list.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
"branch": "master"
},
"Sentry": {
"@comment": "Extension distributor has issue with Sentry Extension vendor. Download from wikimedia mirror and compose-merge.",
"@comment": "Extension distributor has issue with Sentry Extension vendor. Download own version and compose-merge.",
"type": "github",
"repo": "wikimedia/mediawiki-extensions-Sentry",
"repo": "ShinyColorsWiki/mediawiki-extensions-Sentry",
"branch": "master"
},
"TabberNeue": {
Expand Down
2 changes: 1 addition & 1 deletion cron/generate-backup
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# PHP Version
_phpv=81
_phpv=83

# TODO: Why not move this to other dockers?

Expand Down
2 changes: 1 addition & 1 deletion cron/generate-dumps
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# --------

# PHP Version
_phpv=81
_phpv=83

datestamp=`date +'%Y-%m-%d'`
php="sudo -u nginx -g www-data php$_phpv"
Expand Down
2 changes: 1 addition & 1 deletion cron/generate-sitemap
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

# PHP Version
_phpv=81
_phpv=83

cd /srv/wiki

Expand Down
2 changes: 1 addition & 1 deletion cron/run-jobs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

# PHP Version
_phpv=81
_phpv=83

cd /srv/wiki/w

Expand Down
2 changes: 1 addition & 1 deletion cron/run-transcode-jobs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

# PHP Version
_phpv=81
_phpv=83

cd /srv/wiki/w

Expand Down
2 changes: 1 addition & 1 deletion cron/update-sfs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# PHP Version
_phpv=81
_phpv=83

sudo -u nginx -g www-data php$_phpv /srv/wiki/w/extensions/StopForumSpam/maintenance/updateDenyList.php
2 changes: 1 addition & 1 deletion run
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail
echo "Starting wiki..."

# PHP Version
_phpv=81
_phpv=83

# Wait until other services are fully started.
seconds=10
Expand Down
Loading