Auto-merging via docker-versions-create

.github/workflows/build-multiarch.yml

@@ -3,8 +3,7 @@ on:
   push:
     branches:
       - master
-      - "*-multiarch"
+      - java8-multiarch
-      - "multiarch*"
       - java8-openj9
       - java11*
       - java16*
@@ -12,8 +11,7 @@ on:
       - test/*
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch*"
+      - "[0-9]+.[0-9]+.[0-9]+-java8-multiarch"
-      - "[0-9]+.[0-9]+.[0-9]+-*multiarch"
       - "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
       - "[0-9]+.[0-9]+.[0-9]+-java11*"
       - "[0-9]+.[0-9]+.[0-9]+-java16*"

DEVELOPMENT.md

@@ -2,10 +2,10 @@
 
 Adding a new server `TYPE` can vary due to the complexity of obtaining and configuring each type; however, the addition of any server type includes at least the following steps:
 
-1. Copy an existing "start-deploy*" script, such as [start-deployMohist](start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix
+1. Copy an existing "start-deploy*" script, such as [start-deployMohist](scripts/start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix
 2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-setupWorld` at the end of the script 
 3. Develop and test the changes using the [iterative process described below](#iterative-script-development)
-4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](start-configuration)
+4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](scripts/start-configuration)
 5. Add a section to the [README](README.md). It is recommended to copy-modify an existing section to retain a similar wording and level of detail
 6. [Submit a pull request](https://github.com/itzg/docker-minecraft-server/pulls)
 

Dockerfile

@@ -67,8 +67,6 @@ RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
     && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
 
 VOLUME ["/data"]
-COPY server.properties /tmp/server.properties
-COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
 STOPSIGNAL SIGTERM
@@ -81,11 +79,12 @@ ENV UID=1000 GID=1000 \
   ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
   AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
 
-COPY start* /
+COPY scripts/start* /
 COPY bin/ /usr/local/bin/
 COPY bin/mc-health /health.sh
-
+COPY files/server.properties /tmp/server.properties
-ADD files/autopause /autopause
+COPY files/log4j2.xml /tmp/log4j2.xml
+COPY files/autopause /autopause
 
 RUN dos2unix /start* && chmod +x /start* \
     && dos2unix /autopause/* && chmod +x /autopause/*.sh

README.md

@@ -132,7 +132,7 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Enabling Autopause](#enabling-autopause)
    * [Running on RaspberryPi](#running-on-raspberrypi)
 
-<!-- Added by: runner, at: Wed Oct 20 20:36:22 UTC 2021 -->
+<!-- Added by: runner, at: Fri Oct 22 21:06:58 UTC 2021 -->
 
 <!--te-->
 
@@ -280,7 +280,6 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | java17         | 17           | Ubuntu | Hotspot  | amd64             |
-| multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
 
 For example, to use Java version 16 on any supported architecture:
 
@@ -295,6 +294,7 @@ The following image tags have been deprecated and are no longer receiving update
 - adopt14
 - adopt15
 - openj9-nightly
+- multiarch-latest
 
 ## Healthcheck
 

docker-versions-create.sh

@@ -10,7 +10,6 @@ branches_list=(
   'java16'
   'java16-openj9'
   'java17'
-  'multiarch-latest'
   )
 
 function TrapExit {

examples/docker-compose-ftba.yml

@@ -3,7 +3,7 @@ version: "3.8"
 services:
   mc:
     # FTBA support is only available in non-Alpine images
-    image: itzg/minecraft-server:java8-multiarch
+    image: itzg/minecraft-server:${IMAGE_TAG:-java8-multiarch}
     ports:
       # expose the Minecraft server port outside of container
       - 25565:25565
@@ -14,10 +14,11 @@ services:
       TYPE: FTBA
       # Use Pack ID from https://ftb.neptunepowered.org/pack/ftb-presents-direwolf20-1-12/
       FTB_MODPACK_ID: "31"
+      FTB_MODPACK_VERSION_ID: ""
     volumes:
       # use a named, managed volume for data volume
-      - mc_ftb:/data
+      - ftba:/data
 
 volumes:
   # declared the named volume, but use default/local storage engine
-  mc_ftb: {}
+  ftba: {}

minecraft-server/README.md

@@ -1,4 +0,0 @@
-# Moved to top-level
-
-The contents of this directory have now been moved to the top level of
-[itzg/docker-minecraft-server](https://github.com/itzg/docker-minecraft-server).

scripts/start-configuration

@@ -140,10 +140,6 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployCustom "$@"
   ;;
 
-  CURSE_INSTANCE)
-    exec ${SCRIPTS:-/}start-validateCurseInstance "$@"
-  ;;
-
   MAGMA)
     exec ${SCRIPTS:-/}start-deployMagma "$@"
   ;;
@@ -185,7 +181,7 @@ case "${TYPE^^}" in
   *)
       log "Invalid type: '$TYPE'"
       log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
-      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM,"
+      log "         CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM,"
       log "         MAGMA, MOHIST, CATSERVER, AIRPLANE, CANYON, LIMBO, CRUCIBLE"
       exit 1
   ;;

scripts/start-deployFTBA

@@ -16,7 +16,7 @@ if ! [[ ${FTB_MODPACK_ID} =~ [0-9]+ ]]; then
   exit 1
 fi
 
-if ! [[ -v FTB_MODPACK_VERSION_ID ]]; then
+if [[ ! $FTB_MODPACK_VERSION_ID ]]; then
   if ! FTB_MODPACK_VERSION_ID=$(curl -fsSL https://api.modpacks.ch/public/modpack/${FTB_MODPACK_ID} | jq -r '.versions | sort_by(.updated)[-1].id'); then
     log "ERROR unable to resolve latest modpack version ID for modpack ${FTB_MODPACK_ID}"
     exit 1

scripts/start-deployForge

@@ -136,7 +136,7 @@ resolve_versions
 
 installMarker="/data/.forge-installed-$shortForgeVersion"
 
-if [ ! -e "$installMarker" ]; then
+if [ ! -e "$installMarker" ] || isTrue "${FORCE_REINSTALL:-false}"; then
   install
 else
   SERVER=$(cat "$installMarker")

scripts/start-finalExec

@@ -180,14 +180,7 @@ if [[ ${STOP_SERVER_ANNOUNCE_DELAY} ]]; then
   mcServerRunnerArgs+=(--stop-server-announce-delay "${STOP_SERVER_ANNOUNCE_DELAY}s")
 fi
 
-if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
+if [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
-    if isTrue ${DEBUG_EXEC}; then
-      set -x
-    fi
-    exec mc-server-runner "${mcServerRunnerArgs[@]}" \
-      --cf-instance-file "${CURSE_INSTANCE_JSON}" \
-      java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
   copyFilesForCurseForge
 
   cd "${FTB_DIR}" || (log "ERROR: can't go into ${FTB_DIR}"; exit 1)

start-validateCurseInstance

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-. ${SCRIPTS:-/}start-utils
-
-if ! [[ -v CURSE_INSTANCE_JSON ]]; then
-  log "ERROR: CURSE_INSTANCE_JSON needs to be set"
-  exit 2
-elif ! [ -f "${CURSE_INSTANCE_JSON}" ] && [ -f "${CURSE_INSTANCE_JSON}/minecraftinstance.json" ]; then
-  CURSE_INSTANCE_JSON="${CURSE_INSTANCE_JSON}/minecraftinstance.json"
-elif ! [ -f "${CURSE_INSTANCE_JSON}" ]; then
-  log "ERROR: CURSE_INSTANCE_JSON file does not exist: ${CURSE_INSTANCE_JSON}"
-  exit 2
-fi
-
-log "Resolved CURSE_INSTANCE_JSON as ${CURSE_INSTANCE_JSON}"
-
-exec ${SCRIPTS:-/}start-setupWorld "$@"