Auto-merging via docker-versions-create

Merge branch 'master' into java11-openj9
# Conflicts: # .github/workflows/build-multiarch.yml # docker-versions-create.sh
2026-02-17 15:13:55 +00:00 · 2021-05-21 22:50:55 -05:00 · 2021-05-21 22:41:16 -05:00 · 2021-05-21 22:37:40 -05:00 · 2021-05-21 17:34:05 -05:00 · 2021-05-21 17:33:26 -05:00
4 changed files with 15 additions and 3 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -27,7 +27,7 @@ jobs:
  docker-buildx:
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: java8-openj9
+      CACHE_NAME: java11-openj9
    steps:
      - name: Checkout
        uses: actions/checkout@v2.3.4
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
      - test
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: java8-openj9
+      CACHE_NAME: java11-openj9

    steps:
    - uses: actions/checkout@v2.3.4
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:8-jre-openj9
+FROM adoptopenjdk:11-jre-openj9

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

--- a/12
+++ b/12
@@ -98,6 +98,12 @@ case "${TYPE^^}" in
  ;;

  FORGE)
+    log "**********************************************************************"
+    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
+    log "         since some mods require Java 8"
+    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
+    log "         can be fixed with java8"
+    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;

@@ -110,6 +116,12 @@ case "${TYPE^^}" in
  ;;

  FTB|CURSEFORGE)
+    log "**********************************************************************"
+    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
+    log "         since some mods require Java 8"
+    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
+    log "         can be fixed with java8"
+    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;
Author	SHA1	Message	Date
Geoff Bourne	6d26ca04be	Auto-merging via docker-versions-create	2021-05-21 22:50:55 -05:00
Geoff Bourne	577eef3631	Merge branch 'master' into java11-openj9 # Conflicts: # .github/workflows/build-multiarch.yml # docker-versions-create.sh	2021-05-21 22:41:16 -05:00
Geoff Bourne	21d7fb476b	ci: added java11-openj9 branch	2021-05-21 22:37:40 -05:00
Geoff Bourne	4c3a329e31	ci: adjusted CACHE_NAME	2021-05-21 17:34:05 -05:00
Geoff Bourne	6c94e49732	ci: updated java11 Dockerfile	2021-05-21 17:33:26 -05:00
Geoff Bourne	af77b29509	ci: add java11 to build/merge	2021-05-21 17:32:38 -05:00