cf: resolve remaining exclude/include slugs after first unknown mod (#3909)

.github/workflows/build.yml

@@ -12,7 +12,11 @@ on:
       - "examples/**"
       - "notes/**"
       - "kustomize/**"
+      - "docker-compose.yml"
       - "images.json"
+      - "compose-docs.yml"
+      - "zensical.toml"
+      - ".readthedocs.yaml"
 
 jobs:
   build:
@@ -23,17 +27,13 @@ jobs:
         variant:
           - java25
           - java25-jdk
-          - java25-graalvm
           - java21
           - java21-alpine
-          - java21-graalvm
           - java21-jdk
           - java17
-          - java17-graalvm
           - java16
           - java11
           - java8
-          - java8-graalvm-ce
           - java8-jdk
         include:
         # JAVA 25
@@ -45,15 +45,7 @@ jobs:
             baseImage: eclipse-temurin:25
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
-          - variant: java25-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:25-ol10
-            platforms: linux/amd64,linux/arm64
-            mcVersion: latest
         # JAVA 21:
-          - variant: java21-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:21-ol10
-            platforms: linux/amd64,linux/arm64
-            mcVersion: latest
           - variant: java21
             baseImage: eclipse-temurin:21-jre
             platforms: linux/amd64,linux/arm64
@@ -72,10 +64,6 @@ jobs:
             baseImage: eclipse-temurin:17-jre-focal
             platforms: linux/amd64,linux/arm/v7,linux/arm64
             mcVersion: 1.20.4
-          - variant: java17-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:17-ol10
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.20.4
         # JAVA 16
           - variant: java16
             baseImage: adoptopenjdk:16-jre-hotspot
@@ -93,12 +81,6 @@ jobs:
             mcVersion: 1.12.2
             # Pin version for Java 8
             mcHelperVersion: 1.51.1
-          - variant: java8-graalvm-ce
-            baseImage: ghcr.io/graalvm/graalvm-ce:java8
-            platforms: linux/amd64
-            mcVersion: 1.12.2
-            # Pin version for Java 8
-            mcHelperVersion: 1.51.1
           - variant: java8-jdk
             baseImage: eclipse-temurin:8u312-b07-jdk-focal
             platforms: linux/amd64,linux/arm64
@@ -112,7 +94,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.1
+        uses: actions/checkout@v6.0.2
         with:
           # for build-files step
           fetch-depth: 0
@@ -180,14 +162,14 @@ jobs:
           tests/test.sh
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.6.0
+        uses: docker/login-action@v3.7.0
         if: env.HAS_IMAGE_REPO_ACCESS
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v3.6.0
+        uses: docker/login-action@v3.7.0
         if: env.HAS_IMAGE_REPO_ACCESS
         with:
           registry: ghcr.io

.github/workflows/verify-pr.yml

@@ -9,9 +9,11 @@ on:
       - "examples/**"
       - "notes/**"
       - "kustomize/**"
-      - "docker-compose*.yml"
-      - "mkdocs.yml"
+      - "docker-compose.yml"
       - "images.json"
+      - "compose-docs.yml"
+      - "zensical.toml"
+      - ".readthedocs.yaml"
 
 jobs:
   build:
@@ -50,7 +52,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.1
+        uses: actions/checkout@v6.0.2
         with:
           # for build-files step
           fetch-depth: 0

Dockerfile

@@ -49,7 +49,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.52.1
+ARG MC_HELPER_VERSION=1.53.2
 ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 # used for cache busting local copy of mc-image-helper
 ARG MC_HELPER_REV=1

README.md

@@ -2,7 +2,7 @@
 [![Docker Stars](https://img.shields.io/docker/stars/itzg/minecraft-server.svg?logo=docker)](https://hub.docker.com/r/itzg/minecraft-server/)
 [![GitHub Issues](https://img.shields.io/github/issues-raw/itzg/docker-minecraft-server.svg)](https://github.com/itzg/docker-minecraft-server/issues)
 [![Discord](https://img.shields.io/discord/660567679458869252?label=Discord&logo=discord)](https://discord.gg/DXfKpjB)
-[![Build and Publish](https://github.com/itzg/docker-minecraft-server/actions/workflows/build-multiarch.yml/badge.svg)](https://github.com/itzg/docker-minecraft-server/actions/workflows/build-multiarch.yml)
+[![Build and Publish](https://github.com/itzg/docker-minecraft-server/actions/workflows/build.yml/badge.svg)](https://github.com/itzg/docker-minecraft-server/actions/workflows/build.yml)
 [![](https://img.shields.io/badge/Donate-Buy%20me%20a%20coffee-orange.svg)](https://www.buymeacoffee.com/itzg)
 [![Documentation Status](https://readthedocs.org/projects/docker-minecraft-server/badge/?version=latest)](https://docker-minecraft-server.readthedocs.io/en/latest/?badge=latest)
 

build/ol/install-packages.sh

@@ -64,12 +64,16 @@ fi
 # Clean up DNF when done
 dnf clean all
 
-# Download and install patched knockd
-curl -fsSL -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz
-tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
-ln -s /usr/local/sbin/knockd /usr/sbin/knockd
-ls -l /usr/local/sbin/knockd
-setcap cap_net_raw=ep /usr/local/sbin/knockd
+cat <<EOF > /usr/local/sbin/knockd
+#!/bin/sh
+
+echo "Auto-pause (using knockd) is currently unavailable on graalvm image variants"
+echo "Consider using a different image variant https://docker-minecraft-server.readthedocs.io/en/latest/versions/java/"
+echo "or mc-router's auto scale up/down feature https://github.com/itzg/mc-router#docker-auto-scale-updown"
+exit 2
+EOF
+chmod 755 /usr/local/sbin/knockd
+# TODO restore retrieval from https://github.com/Metalcape/knock when tar's "Cannot open: Invalid argument" is solved
 
 # Set git credentials globally
 cat <<EOF >> /etc/gitconfig

docs/requirements.txt

@@ -4,19 +4,19 @@ deepmerge==2.0
 ghp-import==2.1.0
 griffe==1.15.0
 Jinja2==3.1.6
-Markdown==3.10
+Markdown==3.10.1
 MarkupSafe==3.0.3
 mergedeep==1.3.4
 mkdocs==1.6.1
 mkdocs-autorefs==1.4.3
 mkdocs-get-deps==0.2.0
-mkdocstrings==1.0.0
+mkdocstrings==1.0.2
 mkdocstrings-python==2.0.1
-packaging==25.0
-pathspec==1.0.3
+packaging==26.0
+pathspec==1.0.4
 platformdirs==4.5.1
 Pygments==2.19.2
-pymdown-extensions==10.20
+pymdown-extensions==10.20.1
 python-dateutil==2.9.0.post0
 PyYAML==6.0.3
 pyyaml_env_tag==1.1

docs/variables.md

@@ -230,13 +230,13 @@ alternatively, you can mount: <code>/etc/localtime:/etc/localtime:ro
         </tr>
         <tr>
             <td><code>LEVEL</code></td>
-            <td>Maps to [the `level-name` server property](https://minecraft.wiki/w/Server.properties#level-name). You can either switch between world saves or run multiple containers with different saves by using the LEVEL option</td>
+            <td>Maps to <a href="https://minecraft.wiki/w/Server.properties#level-name">the <code>level-name</code> server property</a>. You can either switch between world saves or run multiple containers with different saves by using the LEVEL option</td>
             <td><code>world</code></td>
             <td>⬜️</td>
         </tr>
         <tr>
             <td><code>SERVER_PORT</code></td>
-            <td>Maps to [the `server-port` server property](https://minecraft.wiki/w/Server.properties#server-port). Only change this value if you know what you're doing. It is only needed when using host networking and it is rare that host networking should be used.</td>
+            <td>Maps to <a href="https://minecraft.wiki/w/Server.properties#server-port">the <code>server-port</code> server property</a>. Only change this value if you know what you're doing. It is only needed when using host networking and it is rare that host networking should be used.</td>
             <td><code></code></td>
             <td>⬜️</td>
         </tr>

images.json

@@ -11,7 +11,7 @@
   {
     "tag": "stable",
     "notes": "Always tracks the most recent release",
-    "java": "21",
+    "java": "25",
     "distribution": "ubuntu",
     "jvm": "hotspot",
     "architectures": ["amd64", "arm64"],
@@ -77,13 +77,6 @@
     "architectures": ["amd64", "arm64"],
     "jdk": true
   },
-  {
-    "tag": "java21-graalvm",
-    "java": "21",
-    "distribution": "oracle",
-    "jvm": "graalvm",
-    "architectures": ["amd64", "arm64"]
-  },
   {
     "tag": "java17",
     "java": "17",

scripts/start-deployGTNH

@@ -253,7 +253,7 @@ export ALLOW_FLIGHT="${ALLOW_FLIGHT:=true}"
 export LEVEL_TYPE="${LEVEL_TYPE:=rwg}"
 export DIFFICULTY="${DIFFICULTY:=3}"
 export ENABLE_COMMAND_BLOCK="${ENABLE_COMMAND_BLOCK:=true}"
-export MOTD="${MOTD:="Greg Tech New Horizon $GTNH_PACK_VERSION"}"
+export MOTD="${MOTD:="Greg Tech New Horizons $GTNH_PACK_VERSION"}"
 debug "Set MOTD=$MOTD, ENABLE_COMMAND_BLOCK=$ENABLE_COMMAND_BLOCK, DIFFICULTY=$DIFFICULTY, LEVEL_TYPE=$LEVEL_TYPE, ALLOW_FLIGHT=$ALLOW_FLIGHT"
 
 isDebugging && set -x
@@ -278,4 +278,4 @@ handleGTNH
 
 export USES_MODS=true
 
-exec "$(dirname "$0")/start-setupWorld" "$@"
+exec "$(dirname "$0")/start-setupWorld" "$@"

zensical.toml

@@ -15,7 +15,6 @@ features = [
     "navigation.tabs",
     "navigation.tabs.sticky",
     "navigation.sections",
-    "navigation.expand",
     "navigation.top",
     "navigation.indexes"
 ]