chore: bump bookworm and jobrunner images

Also consolidate the custom dockerfiles into one file per container.

Author: SomeMWDev

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mediawiki:
-    image: docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0
+    image: docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0-s1
     user: "${MW_DOCKER_UID}:${MW_DOCKER_GID}"
     extra_hosts:
       - "host.docker.internal:host-gateway"
@@ -28,7 +28,7 @@ services:
     env_file: config/.env
     networks: [ mw ]
   mediawiki-jobrunner:
-    image: docker-registry.wikimedia.org/dev/bookworm-php83-jobrunner:1.0.0
+    image: docker-registry.wikimedia.org/dev/bookworm-php83-jobrunner:1.0.0-s1
     user: "${MW_DOCKER_UID}:${MW_DOCKER_GID}"
     volumes:
       - "./core:${MW_INSTALL_PATH}:cached"

features/sul3/sul3-apache.Dockerfile features/dockerfiles/apache.Dockerfilefeatures/sul3/sul3-apache.Dockerfile renamed to features/dockerfiles/apache.Dockerfile

@@ -1,11 +1,18 @@
-FROM docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0 AS build
+FROM docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0-s1 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
+FROM docker-registry.wikimedia.org/dev/bookworm-php83-fpm:1.0.0-s1
 
+# 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
+
+# Install Excimer
+RUN apt-get update && \
+    apt-get install php8.3-excimer

features/luasandbox/luasandbox.Dockerfile features/dockerfiles/fpm.Dockerfilefeatures/luasandbox/luasandbox.Dockerfile renamed to features/dockerfiles/fpm.Dockerfile

@@ -0,0 +1,18 @@
+FROM docker-registry.wikimedia.org/dev/bookworm-php83-jobrunner:1.0.0-s1 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-s1
+
+# 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
+
+# Install Excimer
+RUN apt-get update && \
+    apt-get install php8.3-excimer