Merge 'minor-next' into 'major-next'

Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/19601207222

Author: pmmp-admin-bot[bot]

.github/workflows/docker-image-ci.yml

@@ -0,0 +1,47 @@
+name: Docker image CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        submodules: true #needed for build/php submodule
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Create data directories
+      run: |
+        mkdir ./docker/test_data
+        sudo chown -R 1000:1000 ./docker/testsuite ./docker/test_data
+
+    - name: Build image for tag
+      uses: docker/[email protected]
+      with:
+        context: ${{ github.workspace }}
+        push: false
+        load: true
+        file: ${{ github.workspace }}/docker/Dockerfile
+        tags: local-pocketmine-mp
+        build-args: |
+          GIT_HASH=${{ github.sha }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+
+    - name: Test if it runs the normal server properly
+      run: echo stop | docker run --rm -i -e POCKETMINE_ARGS="--settings.enable-dev-builds=1" local-pocketmine-mp
+
+    - name: Test if it loads plugins
+      run: |
+        echo stop | docker run --rm -i -v ./docker/test_data:/data -v ./docker/testsuite/create-data:/plugins -e POCKETMINE_ARGS="--settings.enable-dev-builds=1" local-pocketmine-mp
+        test -f ./docker/test_data/plugin_data/data-test/create-data
+        test "$(cat ./docker/test_data/plugin_data/data-test/create-data)" = "successful"
+
+    - name: Test if it persists plugin data
+      run: echo stop | docker run --rm -i -v ./docker/test_data:/data -v ./docker/testsuite/verify-data:/plugins -e POCKETMINE_ARGS="--settings.enable-dev-builds=1" local-pocketmine-mp

.github/workflows/build-docker-image.yml renamed to .github/workflows/docker-image-publish.yml

@@ -16,6 +16,10 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: true #needed for build/php submodule
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -32,13 +36,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Clone pmmp/PocketMine-Docker repository
-        uses: actions/checkout@v5
-        with:
-          repository: pmmp/PocketMine-Docker
-          fetch-depth: 1
-
-
       - name: Get tag name
         id: tag-name
         run: |
@@ -73,49 +70,45 @@ jobs:
         uses: docker/[email protected]
         with:
           push: true
-          context: ./pocketmine-mp
+          file: ./docker/Dockerfile
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.TAG_NAME }}
             ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.tag-name.outputs.TAG_NAME }}
           build-args: |
-            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
-            PMMP_REPO=${{ github.repository }}
+            GIT_HASH=${{ github.sha }}
 
       - name: Build image for major tag
         if: steps.channel.outputs.CHANNEL == 'stable'
         uses: docker/[email protected]
         with:
           push: true
-          context: ./pocketmine-mp
+          file: ./docker/Dockerfile
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MAJOR }}
             ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MAJOR }}
           build-args: |
-            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
-            PMMP_REPO=${{ github.repository }}
+            GIT_HASH=${{ github.sha }}
 
       - name: Build image for minor tag
         if: steps.channel.outputs.CHANNEL == 'stable'
         uses: docker/[email protected]
         with:
           push: true
-          context: ./pocketmine-mp
+          file: ./docker/Dockerfile
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MINOR }}
             ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:${{ steps.version.outputs.MINOR }}
           build-args: |
-            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
-            PMMP_REPO=${{ github.repository }}
+            GIT_HASH=${{ github.sha }}
 
       - name: Build image for latest tag
         if: steps.channel.outputs.CHANNEL == 'stable'
         uses: docker/[email protected]
         with:
           push: true
-          context: ./pocketmine-mp
+          file: ./docker/Dockerfile
           tags: |
             ${{ steps.docker-repo-name.outputs.NAME }}:latest
             ghcr.io/${{ steps.docker-repo-name.outputs.NAME }}:latest
           build-args: |
-            PMMP_TAG=${{ steps.tag-name.outputs.TAG_NAME }}
-            PMMP_REPO=${{ github.repository }}
+            GIT_HASH=${{ github.sha }}

.gitignore

@@ -17,6 +17,7 @@ memory_dumps/*
 resource_packs/
 server.lock
 /phpstan.neon
+/docker/test_data/
 
 # Common IDEs
 .idea/*

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/pmmp/php-build-scripts.git
 [submodule "examples/plugins/ExamplePlugin"]
 	path = examples/plugins/ExamplePlugin
-	url = git@github.com:pmmp/ExamplePlugin.git
+	url = https://github.com/pmmp/ExamplePlugin.git

changelogs/5.37.md

@@ -35,3 +35,9 @@ Released 21st November 2025.
 ## Documentation
 - Added folder and script plugin examples in the `examples/plugins` folder. (@dktapps)
 - Fixed missing mention of removal of `@softDepend` event handler tag in 4.0.0 changelog. (@dktapps)
+
+# 5.37.3
+Released 21st November 2025.
+
+## Fixes
+- Fixed Docker image build due to bad submodule reference.

docker/Dockerfile

@@ -0,0 +1,63 @@
+#PHP is built in a separate image from PM, so that we don't need to rebuild the entire Dockerfile whenever one src file changes
+FROM ubuntu:22.04 AS build-php
+ARG COMPILE_SH_ARGS="-f -g -P5"
+
+RUN apt-get update && apt-get install --no-install-recommends -y curl ca-certificates build-essential m4 gzip bzip2 bison git cmake autoconf automake pkg-config libtool libtool-bin re2c
+
+RUN mkdir /pocketmine
+COPY ./build/php/compile.sh /pocketmine
+WORKDIR /pocketmine
+RUN ./compile.sh -t linux64 -j ${THREADS:-$(grep -E ^processor /proc/cpuinfo | wc -l)} ${COMPILE_SH_ARGS}
+
+FROM ubuntu:22.04 AS build-pocketmine
+ARG GIT_HASH=""
+RUN test ! -z ${GIT_HASH} || (echo "Missing build-arg GIT_HASH" && false)
+
+RUN apt-get update && apt-get install --no-install-recommends -y curl ca-certificates 7zip
+RUN mkdir /pocketmine
+COPY --from=build-php /pocketmine/bin /pocketmine/bin
+RUN ln -s /pocketmine/bin/php7/bin/php /usr/bin/php
+RUN curl -L https://getcomposer.org/installer | php
+RUN mv composer.phar /usr/bin/composer
+
+COPY ./build/server-phar.php ./build/server-phar-stub.php /pocketmine/repo/build/
+COPY ./resources /pocketmine/repo/resources
+COPY ./src /pocketmine/repo/src
+COPY ./composer.json ./composer.lock /pocketmine/repo/
+
+WORKDIR /pocketmine/repo
+RUN composer install --classmap-authoritative --no-dev --prefer-dist
+RUN php vendor/pocketmine/bedrock-data/.minify_json.php
+RUN php -dphar.readonly=0 ./build/server-phar.php --git ${GIT_HASH}
+# Just to make sure the build script didn't false-positive-exit
+RUN test -f /pocketmine/repo/PocketMine-MP.phar
+
+FROM ubuntu:22.04
+LABEL maintainer="PMMP Team <[email protected]>"
+
+RUN apt-get update && apt-get install --no-install-recommends -y ca-certificates wget
+
+RUN groupadd -g 1000 pocketmine
+RUN useradd -r -d /pocketmine -p "" -u 1000 -m -g pocketmine pocketmine
+
+WORKDIR /pocketmine
+COPY --from=build-php /pocketmine/bin /pocketmine/bin
+RUN ln -s /pocketmine/bin/php7/bin/php /usr/bin/php
+COPY --from=build-pocketmine /pocketmine/repo/PocketMine-MP.phar PocketMine-MP.phar
+ADD ./docker/start.sh /usr/bin/start-pocketmine
+
+RUN mkdir /plugins /data
+RUN chown 1000:1000 /plugins /data . -R
+RUN chmod o+x /usr/bin/php
+
+USER pocketmine
+
+ENV TERM=xterm
+
+EXPOSE 19132/tcp
+EXPOSE 19132/udp
+EXPOSE 19133/udp
+
+VOLUME ["/data", "/plugins"]
+
+CMD ["start-pocketmine"]

docker/README.md

@@ -0,0 +1,101 @@
+# PocketMine-MP Docker image
+This folder contains the files used to build and test the `pmmp/pocketmine-mp` Docker image.
+
+Docker is an easy, safe way to run software in a container where it can't affect anything else on your machine.
+You don't need to build any dependencies, and updating is as simple as changing the version number of the image you're using.
+
+## Pre-requisites
+To install Docker, refer to the [official Docker docs](https://docs.docker.com/engine/install/).
+
+## Running PocketMine-MP from Docker (using Docker Hub)
+This is really easy once you have `docker` installed.
+
+```
+mkdir wherever-you-want
+cd wherever-you-want
+mkdir data plugins
+sudo chown -R 1000:1000 data plugins
+docker run -it -p 19132:19132/udp -v $PWD/data:/data -v $PWD/plugins:/plugins ghcr.io/pmmp/pocketmine-mp
+```
+
+To run a specific version, just add it to the end of the command, like this:
+```
+docker run -it -p 19132:19132/udp -v $PWD/data:/data -v $PWD/plugins:/plugins ghcr.io/pmmp/pocketmine-mp:4.0.0
+```
+
+## Changing the server port
+Docker allows you to map ports, so you don't need to edit `server.properties`.
+
+In the run command shown above, change `19132:19132/udp` to `<port number you want>:19132/udp`. **Note: Do not change the second number.**
+
+> [!WARNING]
+> Do not change the port in `server.properties`. This is unnecessary when using Docker and will make things more complicated.
+
+## Editing the server data
+The server data (e.g. worlds, `server.properties`, etc.) will be stored in the `data` folder you created above.
+
+**Note: If you add new files (e.g. a world), don't forget to change the ownership of the file/folder to `1000:1000`**:
+```
+sudo chown -R 1000:1000 <file/folder you added>
+```
+This is needed to make the server able to access the file/folder.
+
+## Adding plugins
+Plugins can be added by putting them in `plugins` folder you created earlier.
+
+
+**Note: If you add new files, don't forget to change the ownership of the file/folder to `1000:1000`:
+```
+sudo chown -R 1000:1000 <file/folder you added>
+```
+This is needed to make the server able to access the file/folder.
+
+## Run the server in the background
+To run the server in the background, simply change `-it` to `-itd` in the last command above.
+This will run the server in the background even if you closed console. (No need to `screen`/`tmux` anymore!)
+
+### Opening the console of the server
+Use `docker ps` to see a list of running containers. It will look like this:
+```
+user@DYLANS-PC:~/pm-docker-test$ docker ps
+CONTAINER ID   IMAGE                      COMMAND                  CREATED         STATUS         PORTS                                                                              NAMES
+dc20edd3dd62   pmmp/pocketmine-mp:4.0.0   "start-pocketmine"       7 seconds ago   Up 6 seconds   19132/tcp, 0.0.0.0:19132-19133->19132-19133/udp, :::19132-19133->19132-19133/udp   brave_dijkstra
+```
+In this case, the container name is `brave_dijkstra`, but it might be something else in your case.
+
+To open the console, run the following command:
+
+```
+docker attach <container name you saw in docker ps>
+```
+
+To leave the console, just press `Ctrl p` `Ctrl q`.
+
+### Viewing the logs
+To see the logs, run the following command:
+```
+docker logs --tail=100 <container name you saw in docker ps>
+```
+Change `--tail=100` to the number of recent lines in the log you want to see.
+
+## Adding plugins from Poggit
+If the `$POCKETMINE_PLUGINS` is set, the container will auto-download the plugins specified from https://poggit.pmmp.io
+before starting PocketMine-MP.
+
+The list of plugins should be given in the format `PluginOne:1.2.3 PluginTwo:4.5.6`. The version part (`:4.5.6`) is optional.
+
+> [!CAUTION]
+> Plugins won't be redownloaded if they're already in the `plugins` volume, even if the version is different.
+> If you need to update a plugin, you'll need to delete the old plugin `.phar` first.
+
+## Volumes
+- `/data` is a read-write data directory where PocketMine stores all data in.
+	This includes PocketMine config files, player data, worlds and plugin config files/data.
+- `/plugins` is a read-only data directory where PocketMine loads plugins from.
+
+## Advanced usage: Passing args to PocketMine-MP.phar inside the container
+The `POCKETMINE_ARGS` environment variable will be passed to `PocketMine-MP.phar` when run.
+
+## Building this image
+The Dockerfile requires a build-arg `GIT_HASH` to fill the git hash metadata when building `PocketMine-MP.phar`.
+This ensures that `/version`, crash reports, logs etc. report the correct server version.

docker/start.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e
+
+# Detect unowned files (this is a common docker issue)
+BAD_COUNT=$(find /data /plugins ! -user pocketmine | wc -l)
+if [ "$BAD_COUNT" -gt 0 ]; then
+	echo "=== WARNING ==="
+	echo "Detected $BAD_COUNT files in /data or /plugins not owned by the user \"pocketmine\"!"
+	echo "For example:"
+	find /data /plugins ! -user pocketmine | head
+	echo "This may cause problems when running the server."
+	echo "If you mount /data and /plugins from a local directory, consider running \`chown -R 1000:1000 \$MOUNT\` (replace \$MOUNT with your local directory) (you may need sudo to run this)"
+	echo "==============="
+	# Continue running the server since this is not necessarily fatal
+fi
+
+# Install plugins from separated-separated env var $POCKETMINE_PLUGINS
+# Versions can be appended to plugin name separated by a colon
+# Example: POCKETMINE_PLUGINS="EconomyAPI:5.7.2 PurePerms PureChat:1.4.11"
+if [ ! -z "$POCKETMINE_PLUGINS" ]; then
+	for PLUGIN in $(echo "$POCKETMINE_PLUGINS" | tr " " "\n"); do
+		PLUGIN_NAME=$(echo "$PLUGIN::" | cut -d: -f1)
+		PLUGIN_VERSION=$(echo "$PLUGIN::" | cut -d: -f2) # The trailing :: ensures that `cut` won't take the first field as the second field
+
+		if [ ! -f "/plugins/$PLUGIN_NAME.phar" ]; then
+			echo "Installing $PLUGIN_NAME:$VERSION from Poggit"
+			wget -O "/plugins/$PLUGIN_NAME.phar" "https://poggit.pmmp.io/get/$PLUGIN_NAME/$PLUGIN_VERSION"
+		fi
+	done
+fi
+
+# Run the server
+cd /pocketmine
+read -ra pm_args <<<"$POCKETMINE_ARGS"
+exec php PocketMine-MP.phar --no-wizard --enable-ansi --data=/data --plugins=/plugins "${pm_args[@]}"

docker/testsuite/create-data/plugin.php

@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @name data-test
+ * @version 1.0.0
+ * @api 5.0.0
+ * @main DataTest
+ * @author PMMP Team
+ */
+
+class DataTest extends \pocketmine\plugin\PluginBase {
+	public function onEnable() : void {
+		file_put_contents($this->getDataFolder() . "/create-data", "successful");
+	}
+}

docker/testsuite/verify-data/plugin.php

@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @name data-test
+ * @version 1.0.0
+ * @api 5.0.0
+ * @main DataTest
+ * @author PMMP Team
+ */
+
+class DataTest extends \pocketmine\plugin\PluginBase {
+	public function onEnable() : void {
+		$data = file_get_contents($this->getDataFolder() . "/create-data");
+		if($data !== "successful") {
+			$this->getLogger()->critical("create-data is not successful");
+			exit(1);
+		}
+		$this->getLogger()->notice("Test passed: create-data is successful");
+	}
+}