Auto-merging via docker-versions-create

Merged latest from master
2026-02-17 23:16:24 +00:00 · 2021-02-10 14:02:05 -06:00 · 2021-02-08 21:18:28 -06:00 · 2021-02-07 18:06:06 -06:00 · 2021-02-06 15:53:59 -06:00 · 2021-02-06 15:49:16 -06:00
2 changed files with 3 additions and 10 deletions
--- a/3
+++ b/3
@@ -1,10 +1,11 @@
-FROM adoptopenjdk:11-jre
+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 \
--- a/10
+++ b/10
@@ -94,10 +94,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 "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;

@@ -109,11 +105,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 "**********************************************************************"
+  CURSEFORGE|FTB)
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;
Author	SHA1	Message	Date
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