Auto-merging via docker-versions-create

#1121

.github/ISSUE_TEMPLATE/bug.yml

@@ -24,9 +24,17 @@ body:
     attributes:
       label: Container definition
       description: Please provide the compose file or run command used to create the container
+      value: |
+        ```
+        Paste run command or compose file here
+        ```
   - type: textarea
     id: logs
     attributes:
       label: Container logs
       description: |
-        Please provide container logs from the start of the container, which will be the ones prefixed with `[init]`. It is even better if you can set the variable `DEBUG` to "true" and provide those debug container logs.
+        Please provide container logs from the start of the container, which will be the ones prefixed with `[init]`. It is even better if you can set the variable `DEBUG` to "true" and provide those debug container logs.
+      value: |
+        ```
+        Paste logs here
+        ```

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:
+  - name: Ask a question in discussions
+    url: https://github.com/itzg/docker-minecraft-server/discussions
+    about: Please ask questions here
+  - name: Ask a question on Discord
+    url: https://discord.gg/DXfKpjB
+    about: Please ask questions here

.github/workflows/build-multiarch.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v2.4.0
 
       - name: Docker meta
         id: meta

.github/workflows/generate-toc.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
       - run: |
           curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc
           chmod a+x gh-md-toc

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
 
       - name: Run tests
         run: |
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
 
     - name: Prepare
       id: prep

.github/workflows/pr.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
 
       - name: Run tests
         run: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk
+FROM eclipse-temurin:8-jdk
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
@@ -75,7 +75,6 @@ ENV UID=1000 GID=1000 \
   MEMORY="1G" \
   TYPE=VANILLA VERSION=LATEST \
   ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
   ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
   AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
 

README.md

@@ -133,7 +133,7 @@ By default, the container will download the latest version of the "vanilla" [Min
    * [Running on RaspberryPi](#running-on-raspberrypi)
    * [Contributing](#contributing)
 
-<!-- Added by: runner, at: Fri Nov  5 02:00:06 UTC 2021 -->
+<!-- Added by: runner, at: Tue Nov 16 02:46:53 UTC 2021 -->
 
 <!--te-->
 
@@ -567,8 +567,6 @@ docker run -d -v /path/on/host:/data ... \
     -e FABRIC_LOADER_VERSION=0.11.7
 ```
 
-In order to add mods, you have two options:
-
 ### Running a Limbo server
 
 A [Limbo](https://github.com/LOOHP/Limbo) server can be run by setting `TYPE` to `LIMBO`.
@@ -808,6 +806,8 @@ This will reset any manual configuration of the `server.properties` file, so if
 
 In the opposite case, you can skip the startup script's creation of `server.properties`, by setting `SKIP_SERVER_PROPERTIES` to "true".
 
+> NOTE: to clear a server property, set the variable to an empty string, such as `-e RESOURCE_PACK=""`. A variables that maps to a server property that is unset, is ignored and the existing `server.property` is left unchanged. 
+
 ### Message of the Day
 
 The message of the day, shown below each server entry in the client UI, can be changed with the `MOTD` environment variable, such as
@@ -875,6 +875,7 @@ The server icon which has been set doesn't get overridden by default. It can be
 ### Rcon
 
 To use rcon use the `ENABLE_RCON` and `RCON_PASSWORD` variables.
+The default RCON password is _"minecraft",_ but it's **highly** recommended to override that.
 By default rcon port will be `25575` but can easily be changed with the `RCON_PORT` variable.
 
     docker run -d -e ENABLE_RCON=true -e RCON_PASSWORD=testing

bin/mc-health

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# shellcheck source=../start-utils
-. ${SCRIPTS:-/}start-utils
+# shellcheck source=../scripts/start-utils
+. "${SCRIPTS:-/}start-utils"
 
 if isTrue "${DISABLE_HEALTHCHECK}"; then
   echo "Healthcheck disabled"
@@ -10,6 +10,6 @@ elif isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -ax -o stat,comm | grep 'java' |
   echo "Java process suspended by Autopause function"
   exit 0
 else
-  mc-monitor status --host localhost --port $SERVER_PORT
+  mc-monitor status --host localhost --port "${SERVER_PORT:-25565}"
   exit $?
 fi

files/log4j2.xml

@@ -4,7 +4,7 @@
         <Console name="SysOut" target="SYSTEM_OUT">
             <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
         </Console>
-        <Queue name="ServerGuiConsole">
+        <Queue name="TerminalConsole">
             <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
         </Queue>
         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
@@ -28,7 +28,7 @@
             </filters>
             <AppenderRef ref="SysOut"/>
             <AppenderRef ref="File"/>
-            <AppenderRef ref="ServerGuiConsole"/>
+            <AppenderRef ref="TerminalConsole"/>
         </Root>
     </Loggers>
 </Configuration>

scripts/start-autopause

@@ -1,9 +1,15 @@
 #!/bin/bash
 
-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
+
+: "${SERVER_PORT:=25565}"
+export SERVER_PORT
 
 log "Autopause functionality enabled"
 
+isDebugging && set -x
+
 cp /autopause/knockd-config.cfg /tmp/knockd-config.cfg
 
 # update server port to listen to

scripts/start-configuration

@@ -103,14 +103,6 @@ case "${TYPE^^}" in
   ;;
 
   FORGE)
-    if versionLessThan 1.17; then
-    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 "**********************************************************************"
-    fi
     exec ${SCRIPTS:-/}start-deployForge "$@"
   ;;
 
@@ -123,10 +115,6 @@ case "${TYPE^^}" in
   ;;
 
   FTB|CURSEFORGE)
-    log "**********************************************************************"
-    log "NOTE: Some mods and modpacks may require Java 8."
-    log "      If so, use itzg/minecraft-server:java8"
-    log "**********************************************************************"
     exec ${SCRIPTS:-/}start-deployCF "$@"
   ;;
 
@@ -171,12 +159,6 @@ case "${TYPE^^}" in
   ;;
 
   CRUCIBLE)
-    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-deployCrucible" "$@"
   ;;
 

scripts/start-deployVanilla

@@ -41,6 +41,16 @@ if [ ! -e "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   fi
 fi
 
+if versionLessThan 1.6; then
+  if ! [[ -L /data/minecraft_server.jar && /data/minecraft_server.jar -ef "/data/$SERVER" ]]; then
+    rm -f /data/minecraft_server.jar
+    ln -s "/data/$SERVER" /data/minecraft_server.jar
+  fi
+  SERVER=minecraft_server.jar
+elif [[ -L /data/minecraft_server.jar ]]; then
+  rm -f /data/minecraft_server.jar
+fi
+
 isDebugging && ls -l
 
 exec "${SCRIPTS:-/}start-setupWorld" "$@"

scripts/start-setupServerProperties

@@ -1,40 +1,46 @@
 #!/bin/bash
 
-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 
-: ${SERVER_PROPERTIES:=/data/server.properties}
+: "${SERVER_PROPERTIES:=/data/server.properties}"
 
 # FUNCTIONS
+function setServerPropValue {
+  local prop=$1
+  local value=$2
+  # normalize booleans
+  case ${value^^} in
+    TRUE|FALSE)
+      value=${value,,} ;;
+  esac
+  if grep "${prop}" "$SERVER_PROPERTIES" > /dev/null; then
+    log "Setting ${prop} to '${value}' in ${SERVER_PROPERTIES}"
+    sed -i "/^${prop}\s*=/ c ${prop}=${value//\\/\\\\}" "$SERVER_PROPERTIES"
+  else
+    log "Adding ${prop} with '${value}' in ${SERVER_PROPERTIES}"
+    echo "${prop}=${value}" >> "$SERVER_PROPERTIES"
+  fi
+}
+
 function setServerProp {
   local prop=$1
-  local var=$2
-  if [ -n "$var" ]; then
-    # normalize booleans
-    case ${var^^} in
-      TRUE|FALSE)
-        var=${var,,} ;;
-    esac
-    if grep "${prop}" "$SERVER_PROPERTIES" > /dev/null; then
-      log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
-      sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
-    else
-      log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}"
-      echo "${prop}=${var}" >> "$SERVER_PROPERTIES"
-    fi
-  else
-    isDebugging && log "Skip setting ${prop}"
+  local varName=$2
+
+  if [ -v $varName ]; then
+    setServerPropValue "$prop" "${!varName}"
   fi
 }
 
 function customizeServerProps {
-  if [ -n "$WHITELIST" ] || isTrue ${ENABLE_WHITELIST:-false}; then
+  if [ -n "$WHITELIST" ] || isTrue "${ENABLE_WHITELIST:-false}"; then
     log "Creating whitelist"
-    setServerProp "whitelist" "true"
-    setServerProp "white-list" "true"
+    setServerPropValue "whitelist" "true"
+    setServerPropValue "white-list" "true"
   else
     log "Disabling whitelist"
-    setServerProp "whitelist" "false"
-    setServerProp "white-list" "false"
+    setServerPropValue "whitelist" "false"
+    setServerPropValue "white-list" "false"
   fi
 
   # If not provided, generate a reasonable default message-of-the-day,
@@ -53,57 +59,57 @@ function customizeServerProps {
     MOTD="A ${label} Minecraft Server powered by Docker"
   fi
 
-  setServerProp "server-name" "$SERVER_NAME"
-  setServerProp "server-ip" "$SERVER_IP"
-  setServerProp "server-port" "$SERVER_PORT"
-  setServerProp "motd" "$(echo $MOTD | mc-image-helper asciify)"
-  setServerProp "allow-nether" "$ALLOW_NETHER"
-  setServerProp "announce-player-achievements" "$ANNOUNCE_PLAYER_ACHIEVEMENTS"
-  setServerProp "enable-command-block" "$ENABLE_COMMAND_BLOCK"
-  setServerProp "spawn-animals" "$SPAWN_ANIMALS"
-  setServerProp "spawn-monsters" "$SPAWN_MONSTERS"
-  setServerProp "spawn-npcs" "$SPAWN_NPCS"
-  setServerProp "spawn-protection" "$SPAWN_PROTECTION"
-  setServerProp "generate-structures" "$GENERATE_STRUCTURES"
-  setServerProp "view-distance" "$VIEW_DISTANCE"
-  setServerProp "hardcore" "$HARDCORE"
-  setServerProp "snooper-enabled" "$SNOOPER_ENABLED"
-  setServerProp "max-build-height" "$MAX_BUILD_HEIGHT"
-  setServerProp "force-gamemode" "$FORCE_GAMEMODE"
-  setServerProp "max-tick-time" "$MAX_TICK_TIME"
-  setServerProp "enable-query" "$ENABLE_QUERY"
-  setServerProp "query.port" "$QUERY_PORT"
-  setServerProp "enable-rcon" "$ENABLE_RCON"
-  setServerProp "rcon.password" "$RCON_PASSWORD"
-  setServerProp "rcon.port" "$RCON_PORT"
-  setServerProp "max-players" "$MAX_PLAYERS"
-  setServerProp "max-world-size" "$MAX_WORLD_SIZE"
-  setServerProp "level-name" "$LEVEL"
-  setServerProp "level-seed" "$SEED"
-  setServerProp "pvp" "${PVP}"
-  setServerProp "generator-settings" "$GENERATOR_SETTINGS"
-  setServerProp "online-mode" "$ONLINE_MODE"
-  setServerProp "allow-flight" "$ALLOW_FLIGHT"
-  setServerProp "level-type" "${LEVEL_TYPE^^}"
-  setServerProp "resource-pack" "$RESOURCE_PACK"
-  setServerProp "resource-pack-sha1" "$RESOURCE_PACK_SHA1"
-  setServerProp "player-idle-timeout" "$PLAYER_IDLE_TIMEOUT"
-  setServerProp "broadcast-console-to-ops" "$BROADCAST_CONSOLE_TO_OPS"
-  setServerProp "broadcast-rcon-to-ops" "$BROADCAST_RCON_TO_OPS"
-  setServerProp "enable-jmx-monitoring" "$ENABLE_JMX"
-  setServerProp "sync-chunk-writes" "$SYNC_CHUNK_WRITES"
-  setServerProp "enable-status" "$ENABLE_STATUS"
-  setServerProp "entity-broadcast-range-percentage" "$ENTITY_BROADCAST_RANGE_PERCENTAGE"
-  setServerProp "function-permission-level" "$FUNCTION_PERMISSION_LEVEL"
-  setServerProp "network-compression-threshold" "$NETWORK_COMPRESSION_THRESHOLD"
-  setServerProp "op-permission-level" "$OP_PERMISSION_LEVEL"
-  setServerProp "prevent-proxy-connections" "$PREVENT_PROXY_CONNECTIONS"
-  setServerProp "use-native-transport" "$USE_NATIVE_TRANSPORT"
-  setServerProp "enforce-whitelist" "$ENFORCE_WHITELIST"
-  setServerProp "simulation-distance" "$SIMULATION_DISTANCE"
+  setServerProp "server-name" SERVER_NAME
+  setServerProp "server-ip" SERVER_IP
+  setServerProp "server-port" SERVER_PORT
+  setServerProp "allow-nether" ALLOW_NETHER
+  setServerProp "announce-player-achievements" ANNOUNCE_PLAYER_ACHIEVEMENTS
+  setServerProp "enable-command-block" ENABLE_COMMAND_BLOCK
+  setServerProp "spawn-animals" SPAWN_ANIMALS
+  setServerProp "spawn-monsters" SPAWN_MONSTERS
+  setServerProp "spawn-npcs" SPAWN_NPCS
+  setServerProp "spawn-protection" SPAWN_PROTECTION
+  setServerProp "generate-structures" GENERATE_STRUCTURES
+  setServerProp "view-distance" VIEW_DISTANCE
+  setServerProp "hardcore" HARDCORE
+  setServerProp "snooper-enabled" SNOOPER_ENABLED
+  setServerProp "max-build-height" MAX_BUILD_HEIGHT
+  setServerProp "force-gamemode" FORCE_GAMEMODE
+  setServerProp "max-tick-time" MAX_TICK_TIME
+  setServerProp "enable-query" ENABLE_QUERY
+  setServerProp "query.port" QUERY_PORT
+  setServerProp "enable-rcon" ENABLE_RCON
+  setServerProp "rcon.password" RCON_PASSWORD
+  setServerProp "rcon.port" RCON_PORT
+  setServerProp "max-players" MAX_PLAYERS
+  setServerProp "max-world-size" MAX_WORLD_SIZE
+  setServerProp "level-name" LEVEL
+  setServerProp "level-seed" SEED
+  setServerProp "pvp" PVP
+  setServerProp "generator-settings" GENERATOR_SETTINGS
+  setServerProp "online-mode" ONLINE_MODE
+  setServerProp "allow-flight" ALLOW_FLIGHT
+  setServerProp "resource-pack" RESOURCE_PACK
+  setServerProp "resource-pack-sha1" RESOURCE_PACK_SHA1
+  setServerProp "player-idle-timeout" PLAYER_IDLE_TIMEOUT
+  setServerProp "broadcast-console-to-ops" BROADCAST_CONSOLE_TO_OPS
+  setServerProp "broadcast-rcon-to-ops" BROADCAST_RCON_TO_OPS
+  setServerProp "enable-jmx-monitoring" ENABLE_JMX
+  setServerProp "sync-chunk-writes" SYNC_CHUNK_WRITES
+  setServerProp "enable-status" ENABLE_STATUS
+  setServerProp "entity-broadcast-range-percentage" ENTITY_BROADCAST_RANGE_PERCENTAGE
+  setServerProp "function-permission-level" FUNCTION_PERMISSION_LEVEL
+  setServerProp "network-compression-threshold" NETWORK_COMPRESSION_THRESHOLD
+  setServerProp "op-permission-level" OP_PERMISSION_LEVEL
+  setServerProp "prevent-proxy-connections" PREVENT_PROXY_CONNECTIONS
+  setServerProp "use-native-transport" USE_NATIVE_TRANSPORT
+  setServerProp "enforce-whitelist" ENFORCE_WHITELIST
+  setServerProp "simulation-distance" SIMULATION_DISTANCE
+  setServerPropValue "motd" "$(echo "$MOTD" | mc-image-helper asciify)"
+  [[ $LEVEL_TYPE ]] && setServerPropValue "level-type" "${LEVEL_TYPE^^}"
 
   if [ -n "$DIFFICULTY" ]; then
-    case $DIFFICULTY in
+    case ${DIFFICULTY,,} in
       peaceful|0)
         if versionLessThan 1.13; then
           DIFFICULTY=0
@@ -137,13 +143,12 @@ function customizeServerProps {
         exit 1
         ;;
     esac
-    setServerProp "difficulty" "$DIFFICULTY"
+    setServerPropValue "difficulty" "$DIFFICULTY"
   fi
 
   if [ -n "$MODE" ]; then
     log "Setting mode"
-    MODE_LC=$( echo $MODE | tr '[:upper:]' '[:lower:]' )
-    case $MODE_LC in
+    case ${MODE,,} in
       su*|0)
         if versionLessThan 1.13; then
           MODE=0
@@ -177,7 +182,7 @@ function customizeServerProps {
         exit 1
         ;;
     esac
-    setServerProp "gamemode" "$MODE"
+    setServerPropValue "gamemode" "$MODE"
   fi
 }
 
@@ -210,16 +215,16 @@ fi
 
 if isTrue "${ENABLE_AUTOPAUSE}"; then
   current_max_tick=$( grep 'max-tick-time' "$SERVER_PROPERTIES" | sed -r 's/( )+//g' | awk -F= '{print $2}' )
-  if (( $current_max_tick > 0 && $current_max_tick < 86400000 )); then
+  if (( current_max_tick > 0 && current_max_tick < 86400000 )); then
     log "Warning: The server.properties for the server doesn't have the Server Watchdog (effectively) disabled."
     log "Warning (cont): Autopause functionality resuming the process might trigger the Watchdog and restart the server completely."
     log "Warning (cont): Set the max-tick-time property to a high value (or disable the Watchdog with value -1 for versions 1.8.1+)."
   fi
 fi
 
-if isDebugging; then
+if isDebugging && [ -f "${SERVER_PROPERTIES}" ]; then
   log "DEBUG Dumping server.properties"
   cat "${SERVER_PROPERTIES}"
 fi
 
-exec ${SCRIPTS:-/}start-setupEnvVariables $@
+exec "${SCRIPTS:-/}start-setupEnvVariables" "$@"

scripts/start-setupWorld

@@ -1,16 +1,14 @@
 #!/bin/bash
 
-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 set -e
 isDebugging && set -x
 
-: ${LEVEL:=world}
-export LEVEL
-
 if [ $TYPE = "CURSEFORGE" ]; then
-  worldDest=$FTB_DIR/$LEVEL
+  worldDest=$FTB_DIR/${LEVEL:-world}
 else
-  worldDest=/data/$LEVEL
+  worldDest=/data/${LEVEL:-world}
 fi
 
 if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] ); then
@@ -71,4 +69,4 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
   fi
 fi
 
-exec ${SCRIPTS:-/}start-setupModpack $@
+exec "${SCRIPTS:-/}start-setupModpack" "$@"