diff --git a/Dockerfile b/Dockerfile index 8638fd16ae8..d365d1c1d12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz -ARG MC_HELPER_VERSION=1.24.9 +ARG MC_HELPER_VERSION=1.24.10 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \ | tar -C /usr/share -zxf - \ @@ -64,6 +64,7 @@ COPY --chmod=755 scripts/start* / COPY --chmod=755 bin/ /usr/local/bin/ COPY --chmod=755 bin/mc-health /health.sh COPY --chmod=644 files/log4j2.xml /image/log4j2.xml +# By default this file gets retrieved from repo, but bundle in image as potential fallback COPY --chmod=644 files/cf-exclude-include.json /image/cf-exclude-include.json COPY --chmod=755 files/auto /auto diff --git a/README.md b/README.md index 590abfb09df..c0ba643e504 100644 --- a/README.md +++ b/README.md @@ -628,7 +628,7 @@ Pass a page URL to the modpack or a specific file with `CF_PAGE_URL` such as the Instead of a URL, the modpack slug can be provided as `CF_SLUG`. The slug is the short identifier visible in the URL after "/modpacks/", such as -![img.png](docs/cf-slug.png) +![cf-slug](docs/cf-slug.png) For example: ``` @@ -639,7 +639,7 @@ With either the modpack page or slug approach, the latest file will be located a The file ID can be located in the URL like -![img.png](docs/cf-file-id.png) +![cf-file-id](docs/cf-file-id.png) The following two examples both refer to version 1.0.7 of ATM8: @@ -657,6 +657,9 @@ Global and per modpack exclusions can be declared in a JSON file and referenced Alternatively, they can be excluded by passing a comma or space delimited list of **project** slugs or IDs via `CF_EXCLUDE_MODS`. Similarly, there are some mods that are incorrectly tagged as client only. For those, pass the **project** slugs or IDs via `CF_FORCE_INCLUDE_MODS`. If either of these are set, then `CF_EXCLUDE_INCLUDE_FILE` will be **disabled**. +A mod's project ID can be obtained from the right hand side of the project page: +![cf-project-id](docs/cf-project-id.png) + If needing to iterate on the options above, set `CF_FORCE_SYNCHRONIZE` to "true" to ensure the exclude/includes are re-evaluated. > **NOTE:** these options are provided to empower you get your server up and running quickly. Please help out by reporting an issue with the respective mod project. Ideally mod developers should [use correct registrations for one-sided client mods](https://docs.minecraftforge.net/en/latest/concepts/sides/#writing-one-sided-mods). Understandably, those code changes may be non-trivial, so mod authors can also add "Client" to the game versions when publishing. diff --git a/docs/cf-project-id.png b/docs/cf-project-id.png new file mode 100644 index 00000000000..ea78cddcf05 Binary files /dev/null and b/docs/cf-project-id.png differ diff --git a/scripts/start-deployAutoCF b/scripts/start-deployAutoCF index 135e6429e54..58c321b77b1 100644 --- a/scripts/start-deployAutoCF +++ b/scripts/start-deployAutoCF @@ -10,7 +10,7 @@ set -eu : "${CF_FILENAME_MATCHER:=}" : "${CF_PARALLEL_DOWNLOADS:=4}" : "${CF_FORCE_SYNCHRONIZE:=false}" -: "${CF_EXCLUDE_INCLUDE_FILE:=/image/cf-exclude-include.json}" +: "${CF_EXCLUDE_INCLUDE_FILE:=https://raw.githubusercontent.com/itzg/docker-minecraft-server/master/files/cf-exclude-include.json}" : "${CF_EXCLUDE_MODS:=}" : "${CF_FORCE_INCLUDE_MODS:=}"