From 2f489b04ae1b2bbb21be5ba3f73bf8d9e357e0c5 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 22:40:29 -0500 Subject: [PATCH 1/2] docs: replaced openj9-11 with java11-openj9 --- README.md | 5 ++--- docker-versions-create.sh | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 46a5457e..841d060e 100644 --- a/README.md +++ b/README.md @@ -276,13 +276,12 @@ To use a different version of Java, please use a docker tag to run your Minecraf | edge | 16 | Debian | Hotspot | amd64,arm64,armv7 | | java8 | 8 | Alpine | Hotspot | amd64 | | java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | -| java8-openj9 | 8 | Debian | OpenJ9 | amd64 | +| java8-openj9 | 8 | Debian | OpenJ9 | amd64 | | java11 | 11 | Debian | Hotspot | amd64,arm64,armv7 | +| java11-openj9 | 11 | Debian | OpenJ9 | amd64 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | | java16 | 16 | Debian | Hotspot | amd64,arm64,armv7 | | java16-openj9 | 16 | Debian | OpenJ9 | amd64 | -| openj9-11 | 11 | Alpine | OpenJ9 | amd64 | -| multiarch | 11 | Debian | Hotspot | amd64,arm64,armv7 | | multiarch-latest | 15+ | Debian | Hotspot | amd64,arm64,armv7 | For example, to use Java version 15 on any supported architecture: diff --git a/docker-versions-create.sh b/docker-versions-create.sh index 9e6a2a21..81a7bdcd 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -5,12 +5,11 @@ branches_list=( 'java8' 'java8-multiarch' 'java8-openj9' - 'openj9-11' 'java11' + 'java11-openj9' 'java15' 'java16' 'java16-openj9' - 'multiarch' 'multiarch-latest' ) From 373921777ab08a893d9b8d0fc15e638ca12d0984 Mon Sep 17 00:00:00 2001 From: itzg Date: Sat, 22 May 2021 03:44:27 +0000 Subject: [PATCH 2/2] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 841d060e..84bf2a6a 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Enabling Autopause](#enabling-autopause) * [Running on RaspberryPi](#running-on-raspberrypi) - +