From 5698c18a477dcabf8d60f1bb4648b445b6448fb8 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 27 May 2024 14:36:13 -0500 Subject: [PATCH 1/3] build: add back arm64 into java17/21 alpine multiarch --- .github/workflows/build-multiarch.yml | 4 ++-- .github/workflows/verify-pr.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 864bd3a8423..7a8307ecfbe 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -44,7 +44,7 @@ jobs: mcVersion: latest - variant: java21-alpine baseImage: eclipse-temurin:21-jre-alpine - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 mcVersion: latest # JAVA 17: - variant: java17 @@ -62,7 +62,7 @@ jobs: mcVersion: 1.20.4 - variant: java17-alpine baseImage: eclipse-temurin:17-jre-alpine - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 mcVersion: 1.20.4 # JAVA 11: - variant: java11 diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index bc92cec4f66..5ed327da746 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -29,7 +29,7 @@ jobs: mcVersion: latest - variant: java21-alpine baseImage: eclipse-temurin:21-jre-alpine - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 mcVersion: latest # JAVA 17: - variant: java17 From f88150e592f05fc93dee7447ddf70325a3cd982d Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 27 May 2024 14:44:56 -0500 Subject: [PATCH 2/3] java17-alpine arm64 isn't provided by Temurin --- .github/workflows/build-multiarch.yml | 2 +- docs/versions/java.md | 34 +++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 7a8307ecfbe..bf6fc240937 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -62,7 +62,7 @@ jobs: mcVersion: 1.20.4 - variant: java17-alpine baseImage: eclipse-temurin:17-jre-alpine - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 mcVersion: 1.20.4 # JAVA 11: - variant: java11 diff --git a/docs/versions/java.md b/docs/versions/java.md index a34dcb83713..cdb5919f74b 100644 --- a/docs/versions/java.md +++ b/docs/versions/java.md @@ -10,23 +10,23 @@ or explicitly include the tag, such as where `` refers to the first column of this table: -| Tag | Java version | Linux | JVM Type | Architecture | -|------------------|--------------|--------|--------------------|-------------------| -| latest | 21 | Ubuntu | Hotspot | amd64,arm64 | -| stable | 21 | Ubuntu | Hotspot | amd64,arm64 | -| java21 | 21 | Ubuntu | Hotspot | amd64,arm64 | -| java21-alpine | 21 | Alpine | Hotspot | amd64 | -| java21-graalvm | 21 | Oracle | Oracle GraalVM[^1] | amd64,arm64 | -| java17 | 17 | Ubuntu | Hotspot | amd64,arm64,armv7 | -| java17-jdk | 17 | Ubuntu | Hotspot+JDK | amd64,arm64,armv7 | -| java17-graalvm | 17 | Oracle | Oracle GraalVM[^1] | amd64,arm64 | -| java17-alpine | 17 | Alpine | Hotspot | amd64 | -| java11 | 11 | Ubuntu | Hotspot | amd64,arm64,armv7 | -| java8 | 8 | Ubuntu | Hotspot | amd64 | -| java8-alpine | 8 | Alpine | Hotspot | amd64 | -| java8-jdk | 8 | Ubuntu | Hotspot+JDK | amd64 | -| java8-openj9 | 8 | Debian | OpenJ9 | amd64 | -| java8-graalvm-ce | 8 | Oracle | GraalVM CE | amd64 | +| Tag | Java version | Linux | JVM Type | Architecture | +|------------------|--------------|--------|--------------------|---------------------| +| latest | 21 | Ubuntu | Hotspot | amd64, arm64 | +| stable | 21 | Ubuntu | Hotspot | amd64, arm64 | +| java21 | 21 | Ubuntu | Hotspot | amd64, arm64 | +| java21-alpine | 21 | Alpine | Hotspot | amd64, arm64 | +| java21-graalvm | 21 | Oracle | Oracle GraalVM[^1] | amd64, arm64 | +| java17 | 17 | Ubuntu | Hotspot | amd64, arm64, armv7 | +| java17-jdk | 17 | Ubuntu | Hotspot+JDK | amd64, arm64, armv7 | +| java17-graalvm | 17 | Oracle | Oracle GraalVM[^1] | amd64, arm64 | +| java17-alpine | 17 | Alpine | Hotspot | amd64 | +| java11 | 11 | Ubuntu | Hotspot | amd64, arm64, armv7 | +| java8 | 8 | Ubuntu | Hotspot | amd64, arm64, armv7 | +| java8-alpine | 8 | Alpine | Hotspot | amd64 | +| java8-jdk | 8 | Ubuntu | Hotspot+JDK | amd64 | +| java8-openj9 | 8 | Debian | OpenJ9 | amd64 | +| java8-graalvm-ce | 8 | Oracle | GraalVM CE | amd64 | !!! example "Example using java8-multiarch" From 57d2ca554dc5428a84f1c723ea65d09907ed11b4 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 27 May 2024 14:53:29 -0500 Subject: [PATCH 3/3] Tweak the docs --- docs/versions/java.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/versions/java.md b/docs/versions/java.md index cdb5919f74b..2018163d283 100644 --- a/docs/versions/java.md +++ b/docs/versions/java.md @@ -20,20 +20,22 @@ where `` refers to the first column of this table: | java17 | 17 | Ubuntu | Hotspot | amd64, arm64, armv7 | | java17-jdk | 17 | Ubuntu | Hotspot+JDK | amd64, arm64, armv7 | | java17-graalvm | 17 | Oracle | Oracle GraalVM[^1] | amd64, arm64 | -| java17-alpine | 17 | Alpine | Hotspot | amd64 | +| java17-alpine | 17 | Alpine | Hotspot | amd64 (1) | | java11 | 11 | Ubuntu | Hotspot | amd64, arm64, armv7 | | java8 | 8 | Ubuntu | Hotspot | amd64, arm64, armv7 | -| java8-alpine | 8 | Alpine | Hotspot | amd64 | +| java8-alpine | 8 | Alpine | Hotspot | amd64 (1) | | java8-jdk | 8 | Ubuntu | Hotspot+JDK | amd64 | | java8-openj9 | 8 | Debian | OpenJ9 | amd64 | | java8-graalvm-ce | 8 | Oracle | GraalVM CE | amd64 | -!!! example "Example using java8-multiarch" +1. Why no arm64 for Java 17 Alpine? That is because the base images, such as [elipse-temurin](https://hub.docker.com/_/eclipse-temurin/tags?page=&page_size=&ordering=&name=17-jre-alpine) do not provide support for that. Use the Ubuntu based images instead. + +!!! example "Example using java8" With docker run command-line ``` - docker run -it -e EULA=true itzg/minecraft-server:java8-multiarch + docker run -it -e EULA=true itzg/minecraft-server:java8 ``` or in a compose file @@ -41,7 +43,7 @@ where `` refers to the first column of this table: ```yaml services: mc: - image: itzg/minecraft-server:java8-multiarch + image: itzg/minecraft-server:java8 ``` !!! note "Latest"