build: introduce stable-{variant} image tags (#3468)

.github/workflows/build-multiarch.yml

@@ -113,16 +113,18 @@ jobs:
             ${{ github.repository_owner }}/minecraft-server
             ghcr.io/${{ github.repository_owner }}/minecraft-server
           tags: |
-            # For the "main" variant, it gets the tag as-is, without suffix
-            type=ref,event=tag,enable=${{ matrix.variant == env.MAIN_VARIANT }}
-            # and each variant (including main one) gets the tag with the variant suffix, such as 2023.1.1-java17
-            type=ref,event=tag,suffix=-${{ matrix.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 the "main" variant, it gets the tag as-is
+            type=pep440,pattern={{version}},enable=${{ matrix.variant == env.MAIN_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
@@ -139,7 +141,7 @@ jobs:
         uses: docker/setup-qemu-action@v3.6.0
 
       - name: Build for test
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.17.0
         with:
           platforms: linux/amd64
           tags: ${{ env.IMAGE_TO_TEST }}
@@ -177,7 +179,7 @@ jobs:
           password: ${{ github.token }}
 
       - name: Build and push
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.17.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.16.0
+        uses: docker/build-push-action@v6.17.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.16.0
+        uses: docker/build-push-action@v6.17.0
         with:
           # Only build single platform since loading multi-arch image into daemon fails with
           # "docker exporter does not currently support exporting manifest lists"

docs/requirements.txt

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

examples/ftba/compose.yml

@@ -12,6 +12,7 @@ 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,6 +28,7 @@
     "clickable-advancements",
     "compass-coords",
     "configured",
+    "controllable",
     "controlling",
     "craftpresence",
     "ctm",
@@ -37,6 +38,7 @@
     "ding",
     "drippy-loading-screen",
     "dynamic-surroundings",
+    "dynamic-view",
     "dynamiclights-reforged",
     "easiervillagertrading",
     "effective-forge",
@@ -44,20 +46,25 @@
     "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",
@@ -65,6 +72,7 @@
     "hwyla",
     "iceberg",
     "ignitioncoil",
+    "illager-raid-music",
     "inmisaddon",
     "iris-flywheel-compat",
     "irisshaders",
@@ -80,8 +88,10 @@
     "legendary-tooltips",
     "lighty",
     "loot-capacitor-tooltips",
+    "loot-journal",
     "lootbeams",
     "magnesium-extras",
+    "make-bubbles-pop",
     "menumobs",
     "minecraft-rich-presence",
     "model-gap-fix",
@@ -95,10 +105,12 @@
     "oculus",
     "oldjavawarning",
     "overloaded-armor-bar",
-    "particular",
     "packmenu",
     "packmodemenu",
+    "particular",
+    "particular-reforged",
     "reauth",
+    "rebind-narrator",
     "reblured",
     "reeses-sodium-options",
     "reforgium",
@@ -122,9 +134,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",
@@ -138,6 +150,7 @@
     "vanillafix",
     "visuality",
     "waila-harvestability",
+    "wakes-reforged",
     "wawla",
     "xaeroplus",
     "yungs-menu-tweaks",
@@ -147,6 +160,9 @@
     "all-of-fabric-6": {
       "forceIncludes": ["revelationary"]
     },
+    "beyond-depth": {
+      "forceIncludes": ["particular-reforged"]		
+    },
     "create-arcane-engineering": {
       "forceIncludes": ["just-enough-resources-jer"]
     },

scripts/start-deployMohist

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