Fabric downloads are better now

.github/workflows/build-multiarch.yml

@@ -113,18 +113,16 @@ jobs:
             ${{ github.repository_owner }}/minecraft-server
             ghcr.io/${{ github.repository_owner }}/minecraft-server
           tags: |
-            # Apply the variant as a moving tag for most recent commit per variant
+            # For the "main" variant, it gets the tag as-is, without suffix
-            type=raw,value=${{ matrix.variant }},enable=${{ github.ref_name == github.event.repository.default_branch }}            
+            type=ref,event=tag,enable=${{ matrix.variant == env.MAIN_VARIANT }}
-            # For the "main" variant, it gets the tag as-is
+            # and each variant (including main one) gets the tag with the variant suffix, such as 2023.1.1-java17
-            type=pep440,pattern={{version}},enable=${{ matrix.variant == env.MAIN_VARIANT }}
+            type=ref,event=tag,suffix=-${{ matrix.variant }}
-            # ...and all variants (including main one) get the tag with the variant suffix, such as 2023.1.1-java17
-            type=pep440,pattern={{version}},suffix=-${{ matrix.variant }}
-            # latest tag gets a moving 'stable' image tag applied to the main variant
-            type=pep440,pattern=stable,enable=${{ matrix.variant == env.MAIN_VARIANT }}
-            # ...and qualified stable for all variants
-            type=pep440,pattern=stable,suffix=-${{ matrix.variant }}
             # for building test/* branch images
             type=ref,event=branch,suffix=-${{ matrix.variant }},enable=${{ github.ref_name != github.event.repository.default_branch }}
+            # latest repo tag gets a moving 'stable' image tag applied to the main variant
+            type=raw,value=stable,enable=${{ github.ref_type == 'tag' && matrix.variant == env.MAIN_VARIANT }}            
+            # apply the variant as a moving tag for most recent commit per variant
+            type=raw,value=${{ matrix.variant }},enable=${{ github.ref_name == github.event.repository.default_branch }}
             # for backward compatibility with users referencing java8-multiarch, this will set an extra label on java8
             type=raw,value=java8-multiarch,enable=${{ matrix.variant == 'java8' && github.ref_name == github.event.repository.default_branch }}
           # NOTE this identifies which variant will be published as "latest", which isn't
@@ -141,7 +139,7 @@ jobs:
         uses: docker/setup-qemu-action@v3.6.0
 
       - name: Build for test
-        uses: docker/build-push-action@v6.17.0
+        uses: docker/build-push-action@v6.16.0
         with:
           platforms: linux/amd64
           tags: ${{ env.IMAGE_TO_TEST }}
@@ -179,7 +177,7 @@ jobs:
           password: ${{ github.token }}
 
       - name: Build and push
-        uses: docker/build-push-action@v6.17.0
+        uses: docker/build-push-action@v6.16.0
         if: github.actor == github.repository_owner
         with:
           platforms: ${{ matrix.platforms }}

.github/workflows/verify-pr.yml

@@ -56,7 +56,7 @@ jobs:
         uses: docker/setup-buildx-action@v3.10.0
 
       - name: Confirm multi-arch build
-        uses: docker/build-push-action@v6.17.0
+        uses: docker/build-push-action@v6.16.0
         with:
           platforms: ${{ matrix.platforms }}
           # ensure latest base image is used
@@ -66,7 +66,7 @@ jobs:
           cache-from: type=gha,scope=${{ matrix.variant }}
 
       - name: Build for test
-        uses: docker/build-push-action@v6.17.0
+        uses: docker/build-push-action@v6.16.0
         with:
           # Only build single platform since loading multi-arch image into daemon fails with
           # "docker exporter does not currently support exporting manifest lists"

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

docs/requirements.txt

@@ -1,4 +1,4 @@
-mkdocs-material == 9.6.14
+mkdocs-material == 9.6.12
 mkdocs-autorefs == 1.4.1
 mkdocstrings[python] == 0.29.1
 mkdocs-literate-nav == 0.6.2

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
+      # Or reference a specific modpack file/version using CF_PAGE_URL, such as this one for 2.47
-      # CF_FILENAME_MATCHER: "1.17"
+      # 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/**

examples/ftba/compose.yml

@@ -12,7 +12,6 @@ services:
       # Use Pack ID from https://www.feed-the-beast.com/modpacks/119-ftb-presents-direwolf20-120?tab=about
       FTB_MODPACK_ID: "119"
 #      FTB_MODPACK_VERSION_ID: ""
-      MEMORY: 4G
     volumes:
       # use a named, managed volume for data volume
       - data:/data

files/cf-exclude-include.json

@@ -28,7 +28,6 @@
     "clickable-advancements",
     "compass-coords",
     "configured",
-    "controllable",
     "controlling",
     "craftpresence",
     "ctm",
@@ -38,7 +37,6 @@
     "ding",
     "drippy-loading-screen",
     "dynamic-surroundings",
-    "dynamic-view",
     "dynamiclights-reforged",
     "easiervillagertrading",
     "effective-forge",
@@ -46,25 +44,20 @@
     "embeddium-extension",
     "embeddium-extras",
     "enchantment-descriptions",
-    "enhanced-boss-bars",
     "enhancedvisuals",
     "entity-collision-fps-fix",
     "entity-model-features",
     "entity-texture-features-fabric",
     "entityculling",
     "equipment-compare",
-    "essential-mod",
     "euphoria-patches",
     "extreme-sound-muffler",
     "ezzoom",
     "fading-night-vision",
     "falling-leaves-forge",
     "fancymenu",
-    "farsight",
     "faster-ladder-climbing",
-    "flerovium",
     "foamfix-optimization-mod",
-    "forgeskyboxes",
     "fps-reducer",
     "free-cam",
     "ftb-backups-2",
@@ -72,7 +65,6 @@
     "hwyla",
     "iceberg",
     "ignitioncoil",
-    "illager-raid-music",
     "inmisaddon",
     "iris-flywheel-compat",
     "irisshaders",
@@ -88,10 +80,8 @@
     "legendary-tooltips",
     "lighty",
     "loot-capacitor-tooltips",
-    "loot-journal",
     "lootbeams",
     "magnesium-extras",
-    "make-bubbles-pop",
     "menumobs",
     "minecraft-rich-presence",
     "model-gap-fix",
@@ -105,12 +95,10 @@
     "oculus",
     "oldjavawarning",
     "overloaded-armor-bar",
+    "particular",
     "packmenu",
     "packmodemenu",
-    "particular",
-    "particular-reforged",
     "reauth",
-    "rebind-narrator",
     "reblured",
     "reeses-sodium-options",
     "reforgium",
@@ -134,9 +122,9 @@
     "sodium-options-api",
     "sodium-rubidium-occlusion-culling-fix",
     "sound",
+    "sound-reloader",
     "sound-filters",
     "sound-physics-remastered",
-    "sound-reloader",
     "stellar-sky",
     "swingthroughgrass",
     "textrues-embeddium-options",
@@ -150,7 +138,6 @@
     "vanillafix",
     "visuality",
     "waila-harvestability",
-    "wakes-reforged",
     "wawla",
     "xaeroplus",
     "yungs-menu-tweaks",
@@ -160,9 +147,6 @@
     "all-of-fabric-6": {
       "forceIncludes": ["revelationary"]
     },
-    "beyond-depth": {
-      "forceIncludes": ["particular-reforged"]		
-    },
     "create-arcane-engineering": {
       "forceIncludes": ["just-enough-resources-jer"]
     },

scripts/start-deployMohist

@@ -9,34 +9,35 @@ isDebugging && set -x
 resolveVersion
 : "${MOHIST_BUILD:=lastSuccessfulBuild}"
 
-# Docs at https://mohistmc.com/mohistmc-api
+mohistBaseUrl="https://mohistmc.com/api/v2/projects/mohist/"
-mohistApiUrl="https://api.mohistmc.com/project/mohist"
+mohistApiUrl="${mohistBaseUrl}${VERSION}/builds/"
-mohistDownloadsPage="https://mohistmc.com/downloadSoftware?project=mohist"
 
-if ! get --exists "${mohistApiUrl}/${VERSION}/builds"; then
+function logMohistAvailableVerisons(){
-  logError "Mohist builds do not exist for ${VERSION}"
+  logError "       check ${mohistBaseUrl} for available versions"
-  logError "       check ${mohistDownloadsPage} for available versions"
   logError "       and set VERSION accordingly"
+}
+
+if ! get --exists "${mohistApiUrl}"; then
+  logError "Mohist builds do not exist for ${VERSION}"
+  logMohistAvailableVerisons
   exit 1
 fi
 
 if [[ "${MOHIST_BUILD}" == "lastSuccessfulBuild" ]]; then
   # Get the latest build number from the API
-  if ! buildNumber=$(
+  buildNumber=$(
-    get --json-path '$[0].id' "${mohistApiUrl}/${VERSION}/builds"
+    get --json-path '$.builds[-1].number' "${mohistApiUrl}"
-  ); then
+  )
-    logError "failed to list Mohist builds for ${VERSION}"
-    exit 1
-  fi
   MOHIST_BUILD="${buildNumber}"
 fi
 
-downloadUrl="${mohistApiUrl}/${VERSION}/builds/${MOHIST_BUILD}/download"
+downloadUrl=$(
+  get --json-path "$.builds[?(@.number==${MOHIST_BUILD})].url" "${mohistApiUrl}"
+)
 
 if [[ -z "${downloadUrl}" ]]; then
   logError "Could not find build ${MOHIST_BUILD} for version ${VERSION}"
-  logError "       check ${mohistDownloadsPage} for available versions"
+  logMohistAvailableVerisons
-  logError "       and set VERSION accordingly"
   exit 1
 fi