Auto-merging via docker-versions-create

CONFLICT (content): Merge conflict in Dockerfile

.github/workflows/build-multiarch.yml

@@ -68,8 +68,6 @@ jobs:
           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
-          pull: true
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           labels: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:11-jre
+FROM adoptopenjdk:15-jre
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 

README.md

@@ -499,18 +499,6 @@ Extra variables:
 - `PURPUR_BUILD=LATEST` : set a specific Purpur build to use
 - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
 
-## Running a Yatopia server
-
-A [Yatopia](https://github.com/YatopiaMC/Yatopia) server, which is a "blazing fast Tuinity fork with best in class performance".
-
-    -e TYPE=YATOPIA
-
-> NOTE: the `VERSION` variable is used to locate the Yatopia version to download
-
-Extra variables:
-- `RELEASE=stable` : set to `stable` or `latest`
-- `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
-
 ## Running a Magma server
 
 A [Magma](https://magmafoundation.org/) server, which is a combination of Forge and PaperMC, can be used with

start-configuration

@@ -4,7 +4,6 @@ IFS=$'\n\t'
 
 . ${SCRIPTS:-/}start-utils
 
-: ${EULA:=}
 : ${PROXY:=}
 : ${RCON_PASSWORD_FILE:=}
 
@@ -109,11 +108,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 "$@"
   ;;
 
@@ -149,15 +144,11 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployPurpur "$@"
   ;;
 
-  YATOPIA)
-    exec ${SCRIPTS:-/}start-deployYatopia "$@"
-  ;;
-
   *)
       log "Invalid type: '$TYPE'"
       log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
       log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, TUINITY, PURPUR"
-      log "         CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA"
+      log "         CUSTOM, MAGMA, MOHIST, CATSERVER"
       exit 1
   ;;
 

start-deployYatopia

@@ -1,30 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-: ${VANILLA_VERSION:?}
-: ${RELEASE:=stable}
-: ${FORCE_REDOWNLOAD:=false}
-
-requireEnum RELEASE stable latest
-
-export SERVER="yatopia-${RELEASE}-${VANILLA_VERSION}.jar"
-
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://api.yatopiamc.org/v2/${RELEASE}Build/download?branch=ver/${VANILLA_VERSION}"
-    log "Downloading Yatopia from $downloadUrl ..."
-    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-fi
-
-# Normalize on Spigot for later operations
-export TYPE=SPIGOT
-export SKIP_LOG4J_CONFIG=true
-
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-minecraftFinalSetup

@@ -168,11 +168,6 @@ function copyFilesForCurseForge() {
   cp -f /data/eula.txt "${FTB_DIR}/"
 }
 
-if ! which java > /dev/null; then
-  log "Fixing PATH to include java"
-  PATH="${PATH}:/usr/bin"
-fi
-
 mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
     if isTrue ${DEBUG_EXEC}; then

start-utils

@@ -144,20 +144,6 @@ requireVar() {
   fi
 }
 
-requireEnum() {
-  var=${1?}
-  shift
-
-  for allowed in $*; do
-    if [[ ${!var} = $allowed ]]; then
-      return 0
-    fi
-  done
-
-  log "ERROR: $var must be set to one of $@"
-#  exit 1
-}
-
 function writeEula() {
   if ! echo "# Generated via Docker
 # $(date)