From 6b308c628f12f92b3c45233b23bb43670f55661a Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 11 May 2025 21:06:46 -0500
Subject: [PATCH 1/4] cf: when "no matching files found" include retrieved
 filenames in error

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3b0295bd8e8..cc3ac07407c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,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.41.9
+ARG MC_HELPER_VERSION=1.41.10
 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

From 7bbabbac826eb4f07d86747ed041ccbc7ece2fff Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Mon, 12 May 2025 07:32:26 -0500
Subject: [PATCH 2/4] Include CF_PAGE_URL in atm10 example

---
 examples/atm10/docker-compose.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/atm10/docker-compose.yml b/examples/atm10/docker-compose.yml
index 3cd35409a90..165ad215814 100644
--- a/examples/atm10/docker-compose.yml
+++ b/examples/atm10/docker-compose.yml
@@ -14,8 +14,10 @@ services:
       # Refer to https://docker-minecraft-server.readthedocs.io/en/latest/types-and-platforms/mod-platforms/auto-curseforge/#api-key
       CF_API_KEY: ${CF_API_KEY}
       CF_SLUG: all-the-mods-10
-      # Optional: select a specific version/file
-      # CF_FILENAME_MATCHER: "1.17"
+      # Or reference a specific modpack file/version using CF_PAGE_URL, such as this one for 2.47
+      # CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/all-the-mods-10/files/6502777
+      # Optional: select a specific version/file when using CF_SLUG
+      # CF_FILENAME_MATCHER: "2.47"
       MEMORY: 4G
       CF_OVERRIDES_EXCLUSIONS: |
         shaderpacks/**

From 9073b22e8446d81dfc8eb8513b8bce4338b2ff50 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Mon, 12 May 2025 08:02:12 -0500
Subject: [PATCH 3/4] Lower FETCH_CONNECTION_POOL_MAX_IDLE_TIMEOUT

---
 tests/setuponlytests/modrinth/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/setuponlytests/modrinth/docker-compose.yml b/tests/setuponlytests/modrinth/docker-compose.yml
index 96e24ed048e..b5203fa4f79 100644
--- a/tests/setuponlytests/modrinth/docker-compose.yml
+++ b/tests/setuponlytests/modrinth/docker-compose.yml
@@ -7,5 +7,7 @@ services:
       TYPE: FABRIC
       VERSION: 1.21.4
       MODRINTH_PROJECTS: fabric-api,cloth-config
+      # Troubleshoot reactor.netty.http.client.PrematureCloseException: Connection prematurely closed DURING response
+      FETCH_CONNECTION_POOL_MAX_IDLE_TIMEOUT: PT2S
     volumes:
       - ./data:/data

From 8d6442d772520fe3549d65fac19535e2718383bf Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Mon, 12 May 2025 09:14:45 -0500
Subject: [PATCH 4/4] Fabric downloads are better now

---
 tests/setuponlytests/modrinth/docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/setuponlytests/modrinth/docker-compose.yml b/tests/setuponlytests/modrinth/docker-compose.yml
index b5203fa4f79..96e24ed048e 100644
--- a/tests/setuponlytests/modrinth/docker-compose.yml
+++ b/tests/setuponlytests/modrinth/docker-compose.yml
@@ -7,7 +7,5 @@ services:
       TYPE: FABRIC
       VERSION: 1.21.4
       MODRINTH_PROJECTS: fabric-api,cloth-config
-      # Troubleshoot reactor.netty.http.client.PrematureCloseException: Connection prematurely closed DURING response
-      FETCH_CONNECTION_POOL_MAX_IDLE_TIMEOUT: PT2S
     volumes:
       - ./data:/data