From 5700f36a6ffc6732af38ad632cad182b9f8e03e0 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 30 Jan 2021 18:32:32 -0600 Subject: [PATCH] Renamed forge branch to java8 --- .github/workflows/main.yml | 4 ++-- README.md | 1 + start-configuration | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b8f2483a..e84e0868 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: push: branches: - master - - forge + - java8 - openj9 - openj9-11 - openj9-nightly @@ -15,7 +15,7 @@ on: - test/* tags: - "[0-9]+.[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+.[0-9]+-forge" + - "[0-9]+.[0-9]+.[0-9]+-java8" - "[0-9]+.[0-9]+.[0-9]+-openj9" - "[0-9]+.[0-9]+.[0-9]+-openj9-11" - "[0-9]+.[0-9]+.[0-9]+-openj9-nightly" diff --git a/README.md b/README.md index 8ca50289..772ebe57 100644 --- a/README.md +++ b/README.md @@ -163,6 +163,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf | 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 | diff --git a/start-configuration b/start-configuration index 57a48b67..e4431321 100644 --- a/start-configuration +++ b/start-configuration @@ -95,6 +95,10 @@ case "${TYPE^^}" in ;; FORGE) + log "**********************************************************************" + log "WARNING: The image tag itzg/minecraft-server:java8 is recommended" + log " since some mods require Java 8" + log "**********************************************************************" exec ${SCRIPTS:-/}start-deployForge "$@" ;;