Add java25-jdk image variant (#3778)

.github/workflows/build-multiarch.yml

@@ -22,6 +22,7 @@ jobs:
         # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config
         variant:
           - java25
+          - java25-jdk
           - java25-graalvm
           - java21
           - java21-alpine
@@ -29,12 +30,10 @@ jobs:
           - java21-jdk
           - java17
           - java17-graalvm
-          - java17-alpine
           - java16
           - java11
           - java8
           - java8-graalvm-ce
-          - java8-openj9
           - java8-jdk
         include:
         # JAVA 25
@@ -42,6 +41,10 @@ jobs:
             baseImage: eclipse-temurin:25-jre
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
+          - variant: java25-jdk
+            baseImage: eclipse-temurin:25
+            platforms: linux/amd64,linux/arm64
+            mcVersion: latest
           - variant: java25-graalvm
             baseImage: container-registry.oracle.com/graalvm/jdk:25-ol10
             platforms: linux/amd64,linux/arm64
@@ -73,10 +76,6 @@ jobs:
             baseImage: container-registry.oracle.com/graalvm/jdk:17-ol10
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.20.4
-          - variant: java17-alpine
-            baseImage: eclipse-temurin:17-jre-alpine
-            platforms: linux/amd64
-            mcVersion: 1.20.4
         # JAVA 16
           - variant: java16
             baseImage: adoptopenjdk:16-jre-hotspot
@@ -105,12 +104,6 @@ jobs:
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.12.2
             # Pin version for Java 8
-#            mcHelperVersion: 1.46.0
-          - variant: java8-openj9
-            baseImage: ibm-semeru-runtimes:open-8u312-b07-jre
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.12.2
-            # Pin version for Java 8
 #            mcHelperVersion: 1.46.0
     env:
       IMAGE_TO_TEST: "${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}"