build: use raw instead of match for stable tag metadata (#2251)

.github/workflows/build-multiarch.yml

@@ -125,16 +125,16 @@ jobs:
             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 }}
-            # latest repo tag gets a moving 'stable' image tag applied to the main variant
-            type=pep440,value=stable,enable=${{ matrix.variant == env.MAIN_VARIANT }},pattern={{version}}
             # for building test/* branch images
-            type=ref,event=branch,suffix=-${{ matrix.variant }},enable=${{ github.ref_name != 'master' }}
-            # 
-            type=raw,value=${{ matrix.variant }},enable=${{ github.ref_name == 'master' }}
+            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 }}
           # NOTE this identifies which variant will be published as "latest", which isn't
           # necessarily the newest version of Java
           flavor: |
-            latest=${{ matrix.variant == env.MAIN_VARIANT && github.ref_name == 'master' }}
+            latest=${{ matrix.variant == env.MAIN_VARIANT && github.ref_name == github.event.repository.default_branch }}
           labels: |
             org.opencontainers.image.authors=Geoff Bourne <itzgeoff@gmail.com>
 
@@ -191,7 +191,7 @@ jobs:
           push: >
             ${{ 
             github.ref_type == 'tag' 
-            || github.ref_name == 'master'
+            || github.ref_name == github.event.repository.default_branch
             || startsWith(github.ref_name, 'test/')
             || ( github.event_name == 'pull_request' 
                  && env.HAS_IMAGE_REPO_ACCESS 

README.md

@@ -511,8 +511,10 @@ Extra variables:
 A [Magma](https://magmafoundation.org/) server, which is a combination of Forge and PaperMC, can be used with
 
     -e TYPE=MAGMA
+    -e MAGMA_VERSION=9f3a3c25
 
-> **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2", "1.16.5", etc.
+> **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2", "1.16.5", etc. 
+> To switch the MAGMA version, you need to take the name of the desired tag from the magmafoundation git repository, [for example, to version 1.18](https://git.magmafoundation.org/magmafoundation/Magma-1-18-x/-/tags).
 
 
 ### Running a Mohist server

docs/versions/java.md

@@ -11,11 +11,12 @@
        cannot be cast to class java.net.URLClassLoader
     ```
 
-When using the image `itzg/minecraft-server` without a tag, the `latest` image tag is implied from the table below. To use a different version of Java, please use an alternate tag to run your Minecraft server container.
+When using the image `itzg/minecraft-server` without a tag, the `latest` image tag is implied from the table below. To use a different version of Java, please use an alternate tag to run your Minecraft server container. The `stable` tag is similar to `latest`; however, it tracks [the most recent repository release/tag](https://github.com/itzg/docker-minecraft-server/releases/latest).
 
 | Tag name          | Java version | Linux  | JVM Type    | Architecture      |
 |-------------------|--------------|--------|-------------|-------------------|
 | latest            | 17           | Ubuntu | Hotspot     | amd64,arm64,armv7 |
+| stable            | 17           | Ubuntu | Hotspot     | amd64,arm64,armv7 |
 | java8             | 8            | Alpine | Hotspot     | amd64             |
 | java8-jdk         | 8            | Ubuntu | Hotspot+JDK | amd64             |
 | java8-multiarch   | 8            | Ubuntu | Hotspot     | amd64,arm64,armv7 |

scripts/start-deployMagma

@@ -4,9 +4,11 @@
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x
 
+: "${MAGMA_VERSION:=}"
+
 resolveVersion
 
-if ! downloadUrl=$(get --json-path '$.link' "https://api.magmafoundation.org/api/v2/${VERSION}/latest"); then
+if ! downloadUrl=$(get --json-path '$.link' "https://api.magmafoundation.org/api/v2/${VERSION}/latest/${MAGMA_VERSION}"); then
   log "ERROR failed to locate latest Magma download for ${VERSION}. Is that version supported?"
   exit 1
 fi