Compare commits

...

17 Commits

Author SHA1 Message Date
dependabot[bot]
6402e72fda build(deps): bump mkdocstrings-python from 2.0.2 to 2.0.3 in /docs in the patches group (#3952) 2026-02-23 08:08:22 -06:00
Geoff Bourne
8b2f26535d Refactor issue label workflow for Discord notifications (#3950) 2026-02-21 17:15:30 -06:00
Spencer
e202239e66 Update link to example compose file for HTTP Proxy config (#3949) 2026-02-19 18:35:16 -06:00
Geoff Bourne
4e4d6959e4 Bump latest to java 25 in images.json (#3948) 2026-02-16 16:08:58 -06:00
renovate[bot]
92f3200b4c chore(deps): update dependency itzg/restify to v1.7.12 (#3947) 2026-02-16 15:36:58 -06:00
renovate[bot]
02b8993561 chore(deps): update dependency itzg/mc-monitor to v0.16.1 (#3946)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-16 14:17:57 -06:00
Geoff Bourne
4466c778db Markup other dependencies in Dockerfile for Renovate (#3945) 2026-02-16 14:11:57 -06:00
renovate[bot]
f5616795bd chore(deps): update dependency itzg/mc-image-helper to v1.54.1 (#3944)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2026-02-16 13:43:20 -06:00
Geoff Bourne
a00062ba64 build: fix regex pattern that was bad in docs (#3943) 2026-02-16 13:34:05 -06:00
Geoff Bourne
d217e21903 Corrected enabled managers reference (#3936) 2026-02-16 11:51:50 -06:00
dependabot[bot]
dd5e2be036 build(deps): bump griffe from 1.15.0 to 2.0.0 in /docs (#3941)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-02-16 11:50:18 -06:00
dependabot[bot]
b818a72e54 build(deps): bump the patches group in /docs with 5 updates (#3940) 2026-02-16 08:52:26 -06:00
dependabot[bot]
fe1cadcb0d build(deps): bump docker/build-push-action from 6.18.0 to 6.19.2 in the updates group (#3939) 2026-02-16 08:50:24 -06:00
Geoff Bourne
ac125dc15e Temporarily replace GTNH ServerPacks call with restify+jq (#3938) 2026-02-15 17:33:46 -06:00
Andre Blanke
4c0fd104c6 Exit early on failed GTNH packs retrieval (#3931) 2026-02-15 13:20:18 -06:00
Geoff Bourne
cca86e6a3d Tuning renovate config to just custom regex (#3928) 2026-02-15 09:52:49 -06:00
renovate[bot]
67ec9e1b3c chore: Configure Renovate (#3923)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>
2026-02-14 14:46:05 -06:00
20 changed files with 73 additions and 96 deletions

1
.github/release.yml vendored
View File

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

View File

@@ -17,6 +17,7 @@ on:
- "compose-docs.yml" - "compose-docs.yml"
- "zensical.toml" - "zensical.toml"
- ".readthedocs.yaml" - ".readthedocs.yaml"
- "renovate.json5"
jobs: jobs:
build: build:
@@ -137,7 +138,7 @@ jobs:
uses: docker/setup-qemu-action@v3.7.0 uses: docker/setup-qemu-action@v3.7.0
- name: Build for test - name: Build for test
uses: docker/build-push-action@v6.18.0 uses: docker/build-push-action@v6.19.2
with: with:
platforms: linux/amd64 platforms: linux/amd64
tags: ${{ env.IMAGE_TO_TEST }} tags: ${{ env.IMAGE_TO_TEST }}
@@ -177,7 +178,7 @@ jobs:
password: ${{ github.token }} password: ${{ github.token }}
- name: Build and push - name: Build and push
uses: docker/build-push-action@v6.18.0 uses: docker/build-push-action@v6.19.2
if: github.actor == github.repository_owner if: github.actor == github.repository_owner
with: with:
platforms: ${{ matrix.platforms }} platforms: ${{ matrix.platforms }}

View File

@@ -1,33 +1,15 @@
name: Issue labels name: Issues notify
on: on:
issues: issues:
types: [labeled, reopened, closed, deleted] types:
- opened
env: - labeled
DISCORD_WEBHOOK: ${{ secrets.DISCORD_ISSUES_WEBHOOK }} - unlabeled
- closed
jobs: jobs:
labelNotify: notify:
runs-on: ubuntu-latest uses: itzg/github-workflows/.github/workflows/issues-notify-discord.yml@main
timeout-minutes: 5 secrets:
steps: discordWebhook: "${{secrets.DISCORD_ISSUES_WEBHOOK}}"
- name: notify on label
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 }}`"

View File

@@ -14,6 +14,7 @@ on:
- "compose-docs.yml" - "compose-docs.yml"
- "zensical.toml" - "zensical.toml"
- ".readthedocs.yaml" - ".readthedocs.yaml"
- "renovate.json5"
jobs: jobs:
build: build:
@@ -61,7 +62,7 @@ jobs:
uses: docker/setup-buildx-action@v3.12.0 uses: docker/setup-buildx-action@v3.12.0
- name: Confirm multi-arch build - name: Confirm multi-arch build
uses: docker/build-push-action@v6.18.0 uses: docker/build-push-action@v6.19.2
with: with:
platforms: ${{ matrix.platforms }} platforms: ${{ matrix.platforms }}
# ensure latest base image is used # ensure latest base image is used
@@ -72,7 +73,7 @@ jobs:
cache-from: type=gha,scope=${{ matrix.variant }} cache-from: type=gha,scope=${{ matrix.variant }}
- name: Build for test - name: Build for test
uses: docker/build-push-action@v6.18.0 uses: docker/build-push-action@v6.19.2
with: with:
# Only build single platform since loading multi-arch image into daemon fails with # Only build single platform since loading multi-arch image into daemon fails with
# "docker exporter does not currently support exporting manifest lists" # "docker exporter does not currently support exporting manifest lists"

View File

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

15
compose-dev.yml Normal file
View File

@@ -0,0 +1,15 @@
services:
mc-dev:
build:
context: .
environment:
EULA: true
volumes:
- ./scripts:/image/scripts:ro
- data:/data
ports:
- "25565:25565"
stdin_open: true
tty: true
volumes:
data:

View File

@@ -166,7 +166,7 @@ such as:
## HTTP Proxy ## 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/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`. 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`.
## Using "noconsole" option ## Using "noconsole" option

View File

@@ -11,61 +11,15 @@ Adding a new server `TYPE` can vary due to the complexity of obtaining and confi
## Iterative script development ## Iterative script development
Individual scripts can be iteratively developed, debugged, and tested using the following procedure. The included `compose-dev.yml` will mount the local `scripts` code into the container and allow for iterative development. Replace `[-e key=value]` with any environment variables you wish to set for testing the modified scripts.
First, build a baseline of the image to include the packages needed by existing or new scripts:
PowerShell: (Example of building and testing ForgeAPI)
```powershell
$env:FOLDER_TO_TEST="forgeapimods_projectids"
$env:IMAGE_TO_TEST="mc-dev"
docker build -t $env:IMAGE_TO_TEST .
pushd "tests/setuponlytests/$env:FOLDER_TO_TEST/"
docker compose run mc
docker compose down -v --remove-orphans
popd
```
PowerShell: Building different images of Java for testing
```powershell
$env:BASE_IMAGE='eclipse-temurin:8u312-b07-jre'
$env:IMAGE_TO_TEST="mc-dev"
docker build --build-arg BASE_IMAGE=$env:BASE_IMAGE -t $env:IMAGE_TO_TEST .
```
Bash: (Example of building and testing ForgeAPI)
```bash
export FOLDER_TO_TEST="forgeapimods_file"
export IMAGE_TO_TEST="mc-dev"
docker build -t $IMAGE_TO_TEST .
pushd tests/setuponlytests/$FOLDER_TO_TEST/
docker compose run mc
docker compose down -v --remove-orphans
popd
```
Using the baseline image, an interactive container can be started to iteratively run the scripts to be developed. By attaching the current workspace directory, you can use the local editor of your choice to iteratively modify scripts while using the container to run them.
```shell ```shell
docker run -it --rm -v ${PWD}:/image/scripts --entrypoint bash mc-dev docker compose -f compose-dev.yml run --rm -it [-e key=value] mc-dev
``` ```
From within the container you can run individual scripts via the attached `/image/scripts/` path; however, be sure to set any environment variables expected by the scripts by either `export`ing them manually: !!! tip
```shell To speed up the development cycle, it is recommended to set `SETUP_ONLY` to `true` as part of the run command above.
export VERSION=1.12.2
/image/scripts/start-deployFabric
```
...or pre-pending script execution:
```shell
VERSION=1.12.2 /image/scripts/start-deployFabric
```
!!! note
You may want to temporarily add an `exit` statement near the end of your script to isolate execution to just the script you're developing.
## Using development copy of tools ## Using development copy of tools

View File

@@ -2,21 +2,21 @@ click==8.3.1
colorama==0.4.6 colorama==0.4.6
deepmerge==2.0 deepmerge==2.0
ghp-import==2.1.0 ghp-import==2.1.0
griffe==1.15.0 griffe==2.0.0
Jinja2==3.1.6 Jinja2==3.1.6
Markdown==3.10.1 Markdown==3.10.2
MarkupSafe==3.0.3 MarkupSafe==3.0.3
mergedeep==1.3.4 mergedeep==1.3.4
mkdocs==1.6.1 mkdocs==1.6.1
mkdocs-autorefs==1.4.3 mkdocs-autorefs==1.4.4
mkdocs-get-deps==0.2.0 mkdocs-get-deps==0.2.0
mkdocstrings==1.0.3 mkdocstrings==1.0.3
mkdocstrings-python==2.0.1 mkdocstrings-python==2.0.3
packaging==26.0 packaging==26.0
pathspec==1.0.4 pathspec==1.0.4
platformdirs==4.5.1 platformdirs==4.9.2
Pygments==2.19.2 Pygments==2.19.2
pymdown-extensions==10.20.1 pymdown-extensions==10.21
python-dateutil==2.9.0.post0 python-dateutil==2.9.0.post0
PyYAML==6.0.3 PyYAML==6.0.3
pyyaml_env_tag==1.1 pyyaml_env_tag==1.1

View File

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

16
renovate.json5 Normal file
View File

@@ -0,0 +1,16 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"enabledManagers": [
"custom.regex"
],
"customManagers": [
{
"customType": "regex",
"managerFilePatterns": ["/^Dockerfile$/"],
"matchStrings": [
"# renovate: datasource=(?<datasource>[a-z-]+?)(?: packageName=(?<packageName>.+?))?(?: versioning=(?<versioning>[a-z-]+))?\\s(?:ENV|ARG) .+?_VERSION=(?<currentValue>.+?)\\s"
]
}
],
"labels": ["dependencies"]
}

0
scripts/start-deployAutoCF Normal file → Executable file
View File

0
scripts/start-deployFolia Normal file → Executable file
View File

3
scripts/start-deployGTNH Normal file → Executable file
View File

@@ -8,10 +8,11 @@ function getGTNHdownloadPath(){
gtnh_download_path="" gtnh_download_path=""
current_java_version=$(mc-image-helper java-release) current_java_version=$(mc-image-helper java-release)
if ! mapfile -t packs < <(curl -sfL 'http://downloads.gtnewhorizons.com/ServerPacks/?raw'); then if ! packs_data="$(restify --tag=a https://www.gtnewhorizons.com/version-history/ | jq -r '.[].href | select(test("Server"))')"; then
logError "Failed to retrieve data from http://downloads.gtnewhorizons.com/ServerPacks/?raw" logError "Failed to retrieve data from http://downloads.gtnewhorizons.com/ServerPacks/?raw"
exit 1 exit 1
fi fi
mapfile -t packs <<< "$packs_data"
log "Start locating server files..." log "Start locating server files..."
for pack in "${packs[@]}"; do for pack in "${packs[@]}"; do

0
scripts/start-deployLeaf Normal file → Executable file
View File

0
scripts/start-deployModrinth Normal file → Executable file
View File

0
scripts/start-deployNeoForge Normal file → Executable file
View File

0
scripts/start-deployPoseidon Normal file → Executable file
View File

0
scripts/start-rconcmds Normal file → Executable file
View File

0
scripts/start-setupRbac Normal file → Executable file
View File