Merged latest from master

Merging latest from master
Added git
2026-06-06 10:49:43 +00:00 · 2021-04-08 19:14:45 -05:00 · 2021-04-01 16:32:55 -05:00 · 2021-04-01 16:28:32 -05:00 · 2021-03-06 16:24:55 -06:00 · 2021-03-06 16:04:31 -06:00
3 changed files with 5 additions and 16 deletions
@@ -66,7 +66,7 @@ jobs:
        with:
          context: .
          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.prep.outputs.tags }}
          # ensure latest base image is used
@@ -1,10 +1,11 @@
-FROM adoptopenjdk:15-openj9
+FROM ubuntu:18.04

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

 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive \
  apt-get install -y \
+    openjdk-8-jre-headless \
    imagemagick \
    gosu \
    sudo \
@@ -56,7 +56,7 @@ fi

 if ! which java > /dev/null; then
  log "Fixing PATH to include java"
-  PATH="${PATH}:/opt/java/openjdk/bin"
+  PATH="${PATH}:/usr/bin"
 fi

 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
@@ -98,12 +98,6 @@ 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 "$@"
  ;;

@@ -115,13 +109,7 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployFTBA "$@"
  ;;

-  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 "**********************************************************************"
+  CURSEFORGE|FTB)
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;
Author	SHA1	Message	Date
Geoff Bourne	812c6365ec	Merged latest from master	2021-04-08 19:14:45 -05:00
Geoff Bourne	42a5131b19	Merging latest from master	2021-04-01 16:32:55 -05:00
Geoff Bourne	624f6a210f	Added git #819	2021-04-01 16:28:32 -05:00
Geoff Bourne	1c63cd18b7	Merge branch 'master' into java8-multiarch # Conflicts: # start-configuration	2021-03-06 16:24:55 -06:00
Geoff Bourne	6266a7e3cc	Shifted PATH-fix earlier in startup	2021-03-06 16:04:31 -06:00
Geoff Bourne	871ecd4d9d	Merge branch 'master' into java8-multiarch # Conflicts: # start-minecraftFinalSetup	2021-02-27 20:52:36 -06:00
Geoff Bourne	c572c95161	Ensure FTBA version.json is readable #784	2021-02-27 16:58:25 -06:00
Geoff Bourne	f7b58fbbb1	Fix PATH to include java when needed	2021-02-10 14:51:24 -06:00
Geoff Bourne	eccfa444a9	Auto-merging via docker-versions-create	2021-02-10 14:02:05 -06:00
Geoff Bourne	e831d25706	Merged latest from master	2021-02-08 21:18:28 -06:00
Geoff Bourne	12e931332b	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:06:06 -06:00
Geoff Bourne	ceee9eddc9	ci: restored base image to ubuntu and install openjdk-8	2021-02-06 15:53:59 -06:00
Geoff Bourne	60ba668743	Merge branch 'master' into java8-multiarch # Conflicts: # Dockerfile	2021-02-06 15:49:16 -06:00
Geoff Bourne	fd1b15e01f	ci: Added java8 variant of multiarch	2021-02-06 15:44:02 -06:00
Geoff Bourne	f856276d71	Upgraded multiarch to Java 11	2021-02-06 15:22:15 -06:00
Geoff Bourne	0300854c46	Merge branch 'master' into multiarch	2021-02-06 15:21:53 -06:00
Geoff Bourne	f06e9f5ede	Merge branch 'master' into multiarch	2021-02-06 14:52:35 -06:00
Geoff Bourne	8d3ca813ed	Auto-merging via docker-versions-create	2021-01-29 21:07:00 -06:00
Geoff Bourne	e97a00e61d	Auto-merging via docker-versions-create	2021-01-12 17:28:11 -06:00