build: fix regex pattern that was bad in docs

.github/release.yml

@@ -2,7 +2,6 @@ changelog:
   exclude:
     authors:
       - dependabot
-      - renovate
   categories:
     - title: Enhancements
       labels:

.github/workflows/issue-label.yml

@@ -1,17 +1,33 @@
-name: Issues notify
+name: Issue labels
 
 on:
   issues:
-    types:
+    types: [labeled, reopened, closed, deleted]
-      - opened
+
-      - labeled
+env:
-      - unlabeled
+  DISCORD_WEBHOOK: ${{ secrets.DISCORD_ISSUES_WEBHOOK }}
-      - closed
 
 jobs:
-  notify:
+  labelNotify:
-    uses: itzg/github-workflows/.github/workflows/issues-notify-discord.yml@main
+    runs-on: ubuntu-latest
-    with:
+    timeout-minutes: 5
-      triageLabel: 'status/needs triage'
+    steps:
-    secrets:
+      - name: notify on label
-      discordWebhook: "${{secrets.DISCORD_ISSUES_WEBHOOK}}"
+        if: > 
+          github.event.label.name == 'enhancement' 
+          || github.event.label.name == 'bug' 
+          || github.event.label.name == 'help wanted'
+          || github.event.label.name == 'priority/high'
+          || github.event.label.name == 'question'
+          || github.event.label.name == 'status/waiting on upstream'
+        uses: Ilshidur/action-discord@master
+        with:
+          args: "[${{ github.event.issue.title }} (#${{ github.event.issue.number }})](<${{ github.event.issue.html_url }}>) added `${{ github.event.label.name }}` label"
+      - name: notify on action change
+        if: > 
+          github.event.action == 'closed'
+          || github.event.action == 'reopened'
+          || github.event.action == 'deleted'
+        uses: Ilshidur/action-discord@master
+        with:
+          args: "[${{ github.event.issue.title }} (#${{ github.event.issue.number }})](<${{ github.event.issue.html_url }}>) has been `${{ github.event.action }}` by `${{ github.event.sender.login }}`"

Dockerfile

@@ -25,37 +25,32 @@ EXPOSE 25565
 ARG APPS_REV=1
 ARG GITHUB_BASEURL=https://github.com
 
-# renovate: datasource=github-releases packageName=itzg/easy-add
 ARG EASY_ADD_VERSION=0.8.11
 ADD ${GITHUB_BASEURL}/itzg/easy-add/releases/download/${EASY_ADD_VERSION}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
 RUN chmod +x /usr/bin/easy-add
 
-# renovate: datasource=github-releases packageName=itzg/restify
+ARG RESTIFY_VERSION=1.7.11
-ARG RESTIFY_VERSION=1.7.12
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${RESTIFY_VERSION} --var app=restify --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-# renovate: datasource=github-releases packageName=itzg/rcon-cli
 ARG RCON_CLI_VERSION=1.7.3
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${RCON_CLI_VERSION} --var app=rcon-cli --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-# renovate: datasource=github-releases packageName=itzg/mc-monitor
+ARG MC_MONITOR_VERSION=0.16.0
-ARG MC_MONITOR_VERSION=0.16.1
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-# renovate: datasource=github-releases packageName=itzg/mc-server-runner
 ARG MC_SERVER_RUNNER_VERSION=1.14.1
 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
 
 # renovate: datasource=github-releases packageName=itzg/mc-image-helper versioning=loose
-ARG MC_HELPER_VERSION=1.55.2
+ARG MC_HELPER_VERSION=1.54.0
 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

docs/configuration/misc-options.md

@@ -166,7 +166,7 @@ such as:
 
 ## HTTP Proxy
 
-You may configure the use of an HTTP/HTTPS proxy by passing the proxy's "host:port" via the environment variable `PROXY`. In [the example compose file](https://github.com/itzg/docker-minecraft-server/blob/master/examples/proxied/compose.yml) it references a Squid proxy. The host and port can be separately passed via the environment variables `PROXY_HOST` and `PROXY_PORT`. A `|` delimited list of hosts to exclude from proxying can be passed via `PROXY_NON_PROXY_HOSTS`.
+You may configure the use of an HTTP/HTTPS proxy by passing the proxy's "host:port" via the environment variable `PROXY`. In [the example compose file](https://github.com/itzg/docker-minecraft-server/blob/master/examples/docker-compose-proxied.yml) it references a Squid proxy. The host and port can be separately passed via the environment variables `PROXY_HOST` and `PROXY_PORT`. A `|` delimited list of hosts to exclude from proxying can be passed via `PROXY_NON_PROXY_HOSTS`.
 
 ## Using "noconsole" option
 

docs/requirements.txt

@@ -11,7 +11,7 @@ mkdocs==1.6.1
 mkdocs-autorefs==1.4.4
 mkdocs-get-deps==0.2.0
 mkdocstrings==1.0.3
-mkdocstrings-python==2.0.3
+mkdocstrings-python==2.0.2
 packaging==26.0
 pathspec==1.0.4
 platformdirs==4.9.2

images.json

@@ -2,7 +2,7 @@
   {
     "tag": "latest",
     "notes": "Always tracks the most recent commit on the main branch",
-    "java": "25",
+    "java": "21",
     "distribution": "ubuntu",
     "jvm": "hotspot",
     "architectures": ["amd64", "arm64"],
@@ -141,5 +141,4 @@
   {"tag": "java8-jdk", "deprecated": true},
   {"tag": "java8-openj9", "deprecated": true},
   {"tag": "java8-graalvm-ce", "deprecated": true}
-
+]
-]

renovate.json5

@@ -11,6 +11,5 @@
         "# renovate: datasource=(?<datasource>[a-z-]+?)(?: packageName=(?<packageName>.+?))?(?: versioning=(?<versioning>[a-z-]+))?\\s(?:ENV|ARG) .+?_VERSION=(?<currentValue>.+?)\\s"
       ]
     }
-  ],
+  ]
-  "labels": ["dependencies"]
 }

scripts/start-deployGTNH

@@ -8,11 +8,8 @@ function getGTNHdownloadPath(){
   gtnh_download_path=""
   current_java_version=$(mc-image-helper java-release)
     
-  if ! packs_data="$(
+  if ! packs_data="$(restify --tag=a https://www.gtnewhorizons.com/version-history/ | jq -r '.[].href | select(test("Server"))')"; then
-    curl -fsSL "https://downloads.gtnewhorizons.com/versions.json" \
+    logError "Failed to retrieve data from http://downloads.gtnewhorizons.com/ServerPacks/?raw"
-      | jq -r '.versions[]?.server? | .[]? | select(type=="string" and test("Server"))'
-  )"; then
-    logError "Failed to retrieve data from https://downloads.gtnewhorizons.com/versions.json"
     exit 1
   fi
   mapfile -t packs <<< "$packs_data"