Skip to content

feat: upgrade images to PHP 8.5 & trixie #26

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.

Sign up for GitHub

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
SomeMWDev merged 5 commits into from
Oct 13, 2026
Merged

feat: upgrade images to PHP 8.5 & trixie #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c027374
feat: upgrade images to PHP 8.5 & trixie
SomeMWDev Oct 13, 2026
27c681d
ci: run on PHP 8.5
SomeMWDev Oct 13, 2026
0656e77
feat: re-add dockerfiles for PHP 8.3 / bookworm
SomeMWDev Oct 13, 2026
ad485b2
fix: update PHP module directory in Dockerfiles
SomeMWDev Oct 13, 2026
ae2e563
ci: use php-actions/composer to run 'test'
SomeMWDev Oct 13, 2026
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
7 changes: 5 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ jobs:
- name: Composer install
uses: php-actions/composer@v6
with:
php_version: '8.3'
php_version: '8.5'
- name: Lint PHP code
run: composer run test
uses: php-actions/composer@v6
with:
command: 'run test'
php_version: '8.5'
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"mediawiki/mediawiki-codesniffer": "^52.0",
"php-parallel-lint/php-parallel-lint": "^1.4",
"mediawiki/minus-x": "^2.0.1",
"symfony/console": "^7.4.13"
"symfony/console": "^8.1.8"
},
"scripts": {
"test": [
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
mediawiki:
image: docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0-s6
image: docker-registry.wikimedia.org/dev/trixie-php85-fpm:1.0.0
user: "${MW_DOCKER_UID:-config/.env}:${MW_DOCKER_GID:-config/.env}"
extra_hosts:
- "host.docker.internal:host-gateway"
Expand All @@ -16,7 +16,7 @@ services:
environment:
HISTFILE: ${MW_INSTALL_PATH:-config/.env}/cache/.bash_history
mediawiki-web:
image: docker-registry.wikimedia.org/dev/bookworm-apache2:1.0.1-s3
image: docker-registry.wikimedia.org/dev/trixie-apache2:1.0.0-s1
user: "${MW_DOCKER_UID:-config/.env}:${MW_DOCKER_GID:-config/.env}"
ports:
- "${MW_DOCKER_PORT:-8080}:8080"
Expand All @@ -30,7 +30,7 @@ services:
env_file: config/.env
networks: [ mw ]
mediawiki-jobrunner:
image: docker-registry.wikimedia.org/dev/bookworm-php83-jobrunner:1.0.0-s6
image: docker-registry.wikimedia.org/dev/trixie-php85-jobrunner:1.0.0
user: "${MW_DOCKER_UID:-config/.env}:${MW_DOCKER_GID:-config/.env}"
volumes:
- "./core:${MW_INSTALL_PATH:-config/.env}:cached"
Expand Down
2 changes: 1 addition & 1 deletion features/dockerfiles/apache.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Important: Make sure the version here matches the latest version of the mediawiki-web image in docker-compose.yml
FROM docker-registry.wikimedia.org/dev/bookworm-apache2:1.0.1-s3
FROM docker-registry.wikimedia.org/dev/trixie-apache2:1.0.0-s1

# Append SUL3 load.php rewrite first, then generic wiki index rewrite, after "RewriteEngine On"
RUN grep -q "wiki rewrite rules" /etc/apache2/sites-available/000-default.conf || \
Expand Down
17 changes: 17 additions & 0 deletions features/dockerfiles/fpm-83.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0-s6 AS build

# Compile LuaSandbox from source
WORKDIR /src
RUN git clone https://gerrit.wikimedia.org/r/mediawiki/php/luasandbox
RUN apt update && apt install php8.3-dev liblua5.1-0-dev -y
RUN cd luasandbox && phpize && ./configure && make

FROM docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0-s6

# Install LuaSandbox
RUN apt update && apt install liblua5.1-0 -y
COPY --from=build /src/luasandbox/modules/luasandbox.so /usr/lib/php/20230831/luasandbox.so
RUN echo 'extension=luasandbox.so' > /etc/php/8.3/mods-available/luasandbox.ini && phpenmod luasandbox

RUN mkdir -p "/opt/phpstorm-coverage" && \
chmod a+rw "/opt/phpstorm-coverage"
10 changes: 5 additions & 5 deletions features/dockerfiles/fpm.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0-s6 AS build
FROM docker-registry.wikimedia.org/dev/trixie-php85-fpm:1.0.0 AS build

# Compile LuaSandbox from source
WORKDIR /src
RUN git clone https://gerrit.wikimedia.org/r/mediawiki/php/luasandbox
RUN apt update && apt install php8.3-dev liblua5.1-0-dev -y
RUN apt update && apt install php8.5-dev liblua5.1-0-dev -y
RUN cd luasandbox && phpize && ./configure && make

FROM docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0-s6
FROM docker-registry.wikimedia.org/dev/trixie-php85-fpm:1.0.0

# Install LuaSandbox
RUN apt update && apt install liblua5.1-0 -y
COPY --from=build /src/luasandbox/modules/luasandbox.so /usr/lib/php/20230831/luasandbox.so
RUN echo 'extension=luasandbox.so' > /etc/php/8.3/mods-available/luasandbox.ini && phpenmod luasandbox
COPY --from=build /src/luasandbox/modules/luasandbox.so /usr/lib/php/20250925/luasandbox.so
RUN echo 'extension=luasandbox.so' > /etc/php/8.5/mods-available/luasandbox.ini && phpenmod luasandbox

RUN mkdir -p "/opt/phpstorm-coverage" && \
chmod a+rw "/opt/phpstorm-coverage"
21 changes: 21 additions & 0 deletions features/dockerfiles/jobrunner-83.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM docker-registry.wikimedia.org/dev/bookworm-php83-jobrunner:1.0.0-s6 AS build

# Compile LuaSandbox from source
WORKDIR /src
RUN git clone https://gerrit.wikimedia.org/r/mediawiki/php/luasandbox
RUN apt update && apt install php8.3-dev liblua5.1-0-dev -y
RUN cd luasandbox && phpize && ./configure && make

FROM docker-registry.wikimedia.org/dev/bookworm-php83-jobrunner:1.0.0-s6

# Install LuaSandbox
RUN apt update && apt install liblua5.1-0 -y
COPY --from=build /src/luasandbox/modules/luasandbox.so /usr/lib/php/20230831/luasandbox.so
RUN echo 'extension=luasandbox.so' > /etc/php/8.3/mods-available/luasandbox.ini && phpenmod luasandbox

# Clean up to reduce the image size
RUN apt clean autoclean && \
apt autoremove --yes && \
rm -rf /var/lib/{apt,dpkg,cache,log}/

ENTRYPOINT ["php", "/srv/mediawiki-config/Farm/Scripts/jobrunner.php"]
10 changes: 5 additions & 5 deletions features/dockerfiles/jobrunner.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM docker-registry.wikimedia.org/dev/bookworm-php83-jobrunner:1.0.0-s6 AS build
FROM docker-registry.wikimedia.org/dev/trixie-php85-jobrunner:1.0.0 AS build

# Compile LuaSandbox from source
WORKDIR /src
RUN git clone https://gerrit.wikimedia.org/r/mediawiki/php/luasandbox
RUN apt update && apt install php8.3-dev liblua5.1-0-dev -y
RUN apt update && apt install php8.5-dev liblua5.1-0-dev -y
RUN cd luasandbox && phpize && ./configure && make

FROM docker-registry.wikimedia.org/dev/bookworm-php83-jobrunner:1.0.0-s6
FROM docker-registry.wikimedia.org/dev/trixie-php85-jobrunner:1.0.0

# Install LuaSandbox
RUN apt update && apt install liblua5.1-0 -y
COPY --from=build /src/luasandbox/modules/luasandbox.so /usr/lib/php/20230831/luasandbox.so
RUN echo 'extension=luasandbox.so' > /etc/php/8.3/mods-available/luasandbox.ini && phpenmod luasandbox
COPY --from=build /src/luasandbox/modules/luasandbox.so /usr/lib/php/20250925/luasandbox.so
RUN echo 'extension=luasandbox.so' > /etc/php/8.5/mods-available/luasandbox.ini && phpenmod luasandbox

# Clean up to reduce the image size
RUN apt clean autoclean && \
Expand Down