From f342f4aa98d78d9f4a515247aa4aa7da00d9dd99 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 6 Feb 2021 15:07:42 -0600 Subject: [PATCH 1/3] ci: Introduced java15 branch ci: Deprecated adopt13, adopt14, openj9-nightly --- README.md | 27 ++++++++++++--------------- docker-versions-create.sh | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 9132b754..b467e0e2 100644 --- a/README.md +++ b/README.md @@ -160,23 +160,20 @@ the server jar remain in the `/data` directory. It is safe to remove those._ To use a different version of Java, please use a docker tag to run your Minecraft server. -| Tag name | Description | Linux | -| -------------- | ------------------------------------------- | ------------ | -| latest | **Default**. Uses Java version 8 | Alpine Linux | -| java8 | Uses Java 8 for Forge mod compatibility | Alpine Linux | -| adopt15 | Uses Java version 15 from AdoptOpenJDK | Alpine Linux | -| adopt14 | Uses Java version 14 from AdoptOpenJDK | Alpine Linux | -| adopt13 | Uses Java version 13 from AdoptOpenJDK | Alpine Linux | -| adopt11 | Uses Java version 11 from AdoptOpenJDK | Alpine Linux | -| openj9 | Uses Eclipse OpenJ9 JVM | Alpine Linux | -| openj9-11 | Uses Eclipse OpenJ9 JVM for Java 11 | Alpine Linux | -| openj9-nightly | Uses Eclipse OpenJ9 JVM testing builds | Alpine Linux | -| multiarch | Uses Java version 8 latest update | Debian Linux | -| multiarch-latest | Uses Java version 15 latest update | Debian Linux | +| Tag name | Java version | Linux | JVM Type | Architecture | +| -------------- | -------------|--------|----------|-------------------| +| latest | 8 | Alpine | Hotspot | amd64 | +| java8 | 8 | Alpine | Hotspot | amd64 | +| java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | +| adopt11 | 11 | Alpine | Hotspot | amd64 | +| openj9 | 8 | Alpine | OpenJ9 | amd64 | +| openj9-11 | 11 | Alpine | OpenJ9 | amd64 | +| multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | +| multiarch-latest | 15+ | Debian | Hotspot | amd64,arm64,armv7 | -For example, to use a Java version 13: +For example, to use Java version 15 on any supported architecture: - docker run --name mc itzg/minecraft-server:adopt13 + docker run --name mc itzg/minecraft-server:java15 Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation. diff --git a/docker-versions-create.sh b/docker-versions-create.sh index b36f6f13..f05e2557 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -1,7 +1,7 @@ #!/bin/bash #set -x # Use this variable to indicate a list of branches that docker hub is watching -branches_list=('openj9' 'openj9-11' 'openj9-nightly' 'adopt11' 'adopt13' 'adopt14' 'adopt15' 'multiarch' 'multiarch-latest') +branches_list=('openj9' 'openj9-11' 'adopt11' 'java15' 'multiarch' 'multiarch-latest') function TrapExit { echo "Checking out back in master" From 081b2c11e4946ca21f5975607d7eed920c1a72de Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 6 Feb 2021 15:11:03 -0600 Subject: [PATCH 2/3] ci: Introduced java15 branch ci: Deprecated adopt13, adopt14, openj9-nightly --- .github/workflows/main.yml | 7 ------- README.md | 10 +++++++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e84e0868..867138b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,11 +7,7 @@ on: - java8 - openj9 - openj9-11 - - openj9-nightly - adopt11 - - adopt13 - - adopt14 - - adopt15 - test/* tags: - "[0-9]+.[0-9]+.[0-9]+" @@ -20,9 +16,6 @@ on: - "[0-9]+.[0-9]+.[0-9]+-openj9-11" - "[0-9]+.[0-9]+.[0-9]+-openj9-nightly" - "[0-9]+.[0-9]+.[0-9]+-adopt11" - - "[0-9]+.[0-9]+.[0-9]+-adopt13" - - "[0-9]+.[0-9]+.[0-9]+-adopt14" - - "[0-9]+.[0-9]+.[0-9]+-adopt15" jobs: test: diff --git a/README.md b/README.md index b467e0e2..98f4b301 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,15 @@ For example, to use Java version 15 on any supported architecture: docker run --name mc itzg/minecraft-server:java15 -Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation. +> Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation. + +### Deprecated Image Tags + +The following image tags have been deprecated and are no longer receiving updates: +- adopt13 +- adopt14 +- adopt15 +- openj9-nightly ## Healthcheck From e7937206af78a975b9bc1d42bbcb52e2a9b0644f Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 6 Feb 2021 15:12:34 -0600 Subject: [PATCH 3/3] ci: Added java15 to multiarch build --- .github/workflows/build-multiarch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index ee0083c7..d8eb6e5c 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -4,10 +4,12 @@ on: branches: - multiarch - multiarch-latest + - java15 - test/multiarch/* tags: - "[0-9]+.[0-9]+.[0-9]+-multiarch" - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest" + - "[0-9]+.[0-9]+.[0-9]+-java15" jobs: docker-buildx: