From e38aa85d3c649f4bb84d0b3fcebd05257dc16358 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 14 Jan 2023 14:58:00 -0600 Subject: [PATCH 1/2] AUTO_CURSEFORGE by default use exclude/include from latest in repo --- Dockerfile | 3 ++- scripts/start-deployAutoCF | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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/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:=}" From c89b4850b9e0c1d4375a65e060e3f46be58695bb Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 14 Jan 2023 15:03:29 -0600 Subject: [PATCH 2/2] Show where to get CF project ID --- README.md | 7 +++++-- docs/cf-project-id.png | Bin 0 -> 5570 bytes 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 docs/cf-project-id.png 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 0000000000000000000000000000000000000000..ea78cddcf05647f6ed54cd399b2cbdab80a3de86 GIT binary patch literal 5570 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 boiJDp<`wGfaXq1BvmhgVbG<5^2T%VCJP_T~ literal 0 HcmV?d00001