Auto-merging via docker-versions-create

For #645

.github/workflows/build-multiarch.yml

@@ -0,0 +1,62 @@
+name: Build and publish multiarch
+on:
+  push:
+    branches:
+      - multiarch
+      - multiarch-latest
+      - "test-multiarch-.*"
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
+
+jobs:
+  docker-buildx:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.2.0
+
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=itzg/minecraft-server
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          fi
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=${GITHUB_REF#refs/heads/}
+            if [[ $VERSION == master ]]; then
+              VERSION=latest
+            fi
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION}"
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=cache_from::${TAGS}
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          cache-from: type=registry,ref=${{ steps.prep.outputs.cache_from }}
+          cache-to: type=inline
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

BUILDING.md

@@ -0,0 +1,11 @@
+Ensure buildx/BuildKit support is enabled and run:
+
+```shell script
+docker buildx build --platform=linux/arm64 --platform=linux/arm/v7 --platform=linux/amd64 --tag itzg/minecraft-server:multiarch --push .
+```
+
+To build for local testing, use:
+
+```shell script
+docker buildx build --platform=linux/amd64 --tag mc-multiarch --load .
+```

Dockerfile

@@ -1,32 +1,27 @@
-FROM openjdk:8u212-jre-alpine
+FROM ubuntu:18.04
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
-# upgrade all packages since alpine jre8 base image tops out at 8u212
+RUN apt-get update \
-RUN apk -U --no-cache upgrade
+  && DEBIAN_FRONTEND=noninteractive \
+  apt-get install -y \
+    openjdk-8-jre-headless \
+    imagemagick \
+    gosu \
+    curl wget \
+    jq \
+    dos2unix \
+    mysql-client \
+    tzdata \
+    rsync \
+    nano \
+    unzip \
+    knockd \
+    ttf-dejavu \
+    && apt-get clean
 
-RUN apk add --no-cache -U \
+RUN addgroup --gid 1000 minecraft \
-  openssl \
+  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
-  imagemagick \
-  lsof \
-  su-exec \
-  shadow \
-  bash \
-  curl iputils wget \
-  git \
-  jq \
-  mysql-client \
-  tzdata \
-  rsync \
-  nano \
-  sudo \
-  knock \
-  ttf-dejavu
-
-RUN addgroup -g 1000 minecraft \
-  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
-  && mkdir -m 777 /data \
-  && chown minecraft:minecraft /data /home/minecraft
 
 COPY files/sudoers* /etc/sudoers.d
 
@@ -34,9 +29,9 @@ EXPOSE 25565 25575
 
 # hook into docker BuildKit --platform support
 # see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-ARG TARGETOS=linux
+ARG TARGETOS
-ARG TARGETARCH=amd64
+ARG TARGETARCH
-ARG TARGETVARIANT=""
+ARG TARGETVARIANT
 
 ARG EASY_ADD_VER=0.7.1
 ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
@@ -70,12 +65,11 @@ COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
 ENV UID=1000 GID=1000 \
-  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
+  MEMORY="1G" \
   TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
   PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
   LEVEL_TYPE=DEFAULT 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 \
+  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 AUTOPAUSE_PERIOD=10
-  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
 
 COPY start* /
 COPY health.sh /

README.md

@@ -146,15 +146,13 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 
 | Tag name       | Description                                 | Linux        |
 | -------------- | ------------------------------------------- | ------------ |
-| latest         | **Default**. Uses Java version 8            | Alpine Linux |
+| latest         | **Default**. Uses Java version 8 update 212 | Alpine Linux |
-| adopt15        | Uses Java version 15 from AdoptOpenJDK      | Alpine Linux |
+| adopt14        | Uses Java version 14 latest update          | Alpine Linux |
-| adopt14        | Uses Java version 14 from AdoptOpenJDK      | Alpine Linux |
+| adopt13        | Uses Java version 13 latest update          | Alpine Linux |
-| adopt13        | Uses Java version 13 from AdoptOpenJDK      | Alpine Linux |
+| adopt11        | Uses Java version 11 latest update          | Alpine Linux |
-| adopt11        | Uses Java version 11 from AdoptOpenJDK      | Alpine Linux |
 | openj9         | Uses Eclipse OpenJ9 JVM                     | Alpine Linux |
 | openj9-nightly | Uses Eclipse OpenJ9 JVM testing builds      | Alpine Linux |
 | multiarch      | Uses Java version 8 latest update           | Debian Linux |
-| multiarch-latest | Uses Java version 15 latest update        | Debian Linux |
 
 For example, to use a Java version 13:
 
@@ -182,22 +180,22 @@ healthy
 
 Some orchestration systems, such as Portainer, don't allow for disabling the default `HEALTHCHECK` declared by this image. In those cases you can approximate the disabling of healthchecks by setting the environment variable `DISABLE_HEALTHCHECK` to `true`.
 
-## Autopause
+## Autopause (experimental)
 
 ### Description
 
+> EXPERIMENTAL: this feature only works with default bridge networking using official Docker distributions. Host networking and container management software, such as Portainer, and NAS solutions do not seem to provide compatible networking.
+
 There are various bug reports on [Mojang](https://bugs.mojang.com) about high CPU usage of servers with newer versions, even with few or no clients connected (e.g. [this one](https://bugs.mojang.com/browse/MC-149018), in fact the functionality is based on [this comment in the thread](https://bugs.mojang.com/browse/MC-149018?focusedCommentId=593606&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-593606)).
 
 An autopause functionality has been added to this image to monitor whether clients are connected to the server. If for a specified time no client is connected, the Java process is stopped. When knocking on the server port (e.g. by the ingame Multiplayer server overview), the process is resumed. The experience for the client does not change.
 
 Of course, even loaded chunks are not ticked when the process is stopped.
 
-From the server's point of view, the pausing causes a single tick to take as long as the process is stopped, so the server watchdog might intervene after the process is continued, possibly forcing a container restart. To prevent this, ensure that the `max-tick-time` in the `server.properties` file is set correctly. Non-vanilla versions might have their own configuration file, you might have to disable their watchdogs separately (e.g. PAPER Servers).
+From the server's point of view, the pausing causes a single tick to take as long as the process is stopped, so the server watchdog might intervene after the process is continued, possibly forcing a container restart. To prevent this, ensure that the `max-tick-time` in the `server.properties` file is set correctly.
 
 On startup the `server.properties` file is checked and, if applicable, a warning is printed to the terminal. When the server is created (no data available in the persistent directory), the properties file is created with the Watchdog disabled.
 
-The utility used to wake the server (`knock(d)`) works at network interface level. So the correct interface has to be set using the `AUTOPAUSE_KNOCK_INTERFACE` variable when using non-default networking environments (e.g. host-networking, Portainer oder NAS solutions). See the description of the variable below.
-
 A starting, example compose file has been provided in [examples/docker-compose-autopause.yml](examples/docker-compose-autopause.yml).
 
 ### Enabling Autopause
@@ -208,7 +206,7 @@ Enable the Autopause functionality by setting:
 -e ENABLE_AUTOPAUSE=TRUE
 ```
 
-The following environment variables define the behaviour of auto-pausing:
+There are 4 more environment variables that define the behaviour:
 * `AUTOPAUSE_TIMEOUT_EST`, default `3600` (seconds)
 describes the time between the last client disconnect and the pausing of the process (read as timeout established)
 * `AUTOPAUSE_TIMEOUT_INIT`, default `600` (seconds)
@@ -217,8 +215,6 @@ describes the time between server start and the pausing of the process, when no
 describes the time between knocking of the port (e.g. by the main menu ping) and the pausing of the process, when no client connects inbetween (read as timeout knocked)
 * `AUTOPAUSE_PERIOD`, default `10` (seconds)
 describes period of the daemonized state machine, that handles the pausing of the process (resuming is done independently)
-* `AUTOPAUSE_KNOCK_INTERFACE`, default `eth0`
-<br>Describes the interface passed to the `knockd` daemon. If the default interface does not work, run the `ifconfig` command inside the container and derive the interface receiving the incoming connection from its output. The passed interface must exist inside the container. Using the loopback interface (`lo`) does likely not yield the desired results.
 
 ## Deployment Templates and Examples
 
@@ -539,12 +535,6 @@ The following example uses `/modpacks` as the container path as the pre-download
         -e CF_SERVER_MOD=/modpacks/SkyFactory_4_Server_4.1.0.zip \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 
-#### Modpack data directory
-
-By default, CurseForge modpacks are expanded into the sub-directory `/data/FeedTheBeast` and executed from there. (The default location was chosen for legacy reasons, when Curse and FTB were maintained together.)
-
-The directory can be changed by setting `CF_BASE_DIR`, such as `-e CF_BASE_DIR=/data`.
-
 #### Buggy start scripts
 
 Some modpacks have buggy or overly complex start scripts. You can avoid using the bundled start script and use this image's standard server-starting logic by adding `-e USE_MODPACK_START_SCRIPT=false`.
@@ -1135,4 +1125,4 @@ To run this image on a RaspberryPi 3 B+, 4, or newer, use the image tag
 
     itzg/minecraft-server:multiarch
 
-> NOTE: you may need to lower the memory allocation, such as `-e MEMORY=750m`
+> NOTE: you may need to lower the memory allocation, such as `-e MEMORY=750m`

examples/modpacks/README.md

@@ -1,3 +1,3 @@
-Place server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.
+Please server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.
 
 The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/2787018>.

files/autopause/autopause-daemon.sh

@@ -2,48 +2,23 @@
 
 . /autopause/autopause-fcns.sh
 
-. ${SCRIPTS:-/}start-utils
+. /start-utils
 
-
+sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d
-autopause_error_loop() {
+if [ $? -ne 0 ] ; then
-  logAutopause "Available interfaces within the docker container:"
-  INTERFACES=$(echo /sys/class/net/*)
-  INTERFACES=${INTERFACES//\/sys\/class\/net\//}
-  logAutopause "  $INTERFACES"
-  logAutopause "Please set the environment variable AUTOPAUSE_KNOCK_INTERFACE to the interface that handles incoming connections."
-  logAutopause "If unsure which interface to choose, run the ifconfig command in the container."
-  logAutopause "Autopause failed to initialize. This log entry will be printed every 30 minutes."
   while :
   do
-    sleep 1800
+    if [[ -n $(ps -o comm | grep java) ]] ; then
-    logAutopause "Autopause failed to initialize."
+      break
+    fi
+    sleep 0.1
   done
-}
-
-# wait for java process to be started
-while :
-do
-  if java_process_exists ; then
-    break
-  fi
-  sleep 0.1
-done
-
-# check for interface existence
-if [[ -z "$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
-  logAutopause "AUTOPAUSE_KNOCK_INTERFACE variable must not be empty!"
-  autopause_error_loop
-fi
-if ! [[ -d "/sys/class/net/$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
-  logAutopause "Selected interface \"$AUTOPAUSE_KNOCK_INTERFACE\" does not exist!"
-  autopause_error_loop
-fi
-
-sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE"
-if [ $? -ne 0 ] ; then
   logAutopause "Failed to start knockd daemon."
-  logAutopause "Probable cause: Unable to attach to interface \"$AUTOPAUSE_KNOCK_INTERFACE\"."
+  logAutopause "Possible cause: docker's host network mode."
-  autopause_error_loop
+  logAutopause "Recreate without host mode or disable autopause functionality."
+  logAutopause "Stopping server."
+  killall -SIGTERM java
+  exit 1
 fi
 
 STATE=INIT

files/autopause/autopause-fcns.sh

@@ -8,10 +8,6 @@ java_running() {
   [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
 }
 
-java_process_exists() {
-  [[ -n "$(ps -a -o comm | grep 'java')" ]]
-}
-
 rcon_client_exists() {
   [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
 }

files/autopause/pause.sh

@@ -17,5 +17,5 @@ if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; th
 
   # finally pause the process
   logAutopauseAction "Pausing Java process"
-  pkill -STOP java
+  killall -q -STOP java
 fi

files/autopause/resume.sh

@@ -4,5 +4,5 @@
 
 if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
   logAutopauseAction "Knocked, resuming Java process"
-  pkill -CONT java
+  killall -q -CONT java
 fi

files/sudoers-mc

@@ -1,2 +1,2 @@
-%minecraft ALL=(ALL) NOPASSWD:/usr/bin/pkill
+%minecraft ALL=(ALL) NOPASSWD:/usr/bin/killall
 %minecraft ALL=(ALL) NOPASSWD:/usr/sbin/knockd

start

@@ -40,7 +40,7 @@ if [ $(id -u) = 0 ]; then
     echo 'hosts: files dns' > /etc/nsswitch.conf
   fi
 
-  exec su-exec ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
+  exec gosu ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
 else
   exec ${SCRIPTS:-/}start-configuration $@
 fi

start-autopause

@@ -46,15 +46,10 @@ if ! [[ $AUTOPAUSE_TIMEOUT_INIT =~ ^[0-9]+$ ]] ; then
   export AUTOPAUSE_TIMEOUT_INIT
   log "Warning: AUTOPAUSE_TIMEOUT_INIT is not numeric, set to 600 (seconds)"
 fi
-if [[ "$AUTOPAUSE_KNOCK_INTERFACE" == "lo" ]] ; then
-  log "Warning: AUTOPAUSE_KNOCK_INTERFACE is set to the local loopback interface."
-  log "         This is not advisable, as incoming connections are likely not picked up there."
-  log "         Continuing with this setting."
-fi
 
-if [[ -n "$MAX_TICK_TIME" && "$MAX_TICK_TIME" != "-1" ]] ; then
+if [[ -n $MAX_TICK_TIME ]] ; then
   log "Warning: MAX_TICK_TIME is non-default, for autopause to work properly, this check should be disabled (-1 for versions >= 1.8.1)"
-elif [[ -z "$MAX_TICK_TIME" ]] ; then
+else
   if versionLessThan 1.8.1; then
     # 10 years
     MAX_TICK_TIME=315360000000

start-configuration

@@ -7,6 +7,8 @@ shopt -s nullglob
 #umask 002
 export HOME=/data
 
+log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
+
 if [ ! -e /data/eula.txt ]; then
   if ! isTrue "$EULA"; then
     log ""
@@ -22,15 +24,6 @@ if [ ! -e /data/eula.txt ]; then
 fi
 
 
-log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
-
-if ! touch /data/.verify_access; then
-  log "ERROR: /data doesn't seem to be writable. Please make sure attached directory is writable by uid=$(id -u)"
-  exit 2
-fi
-
-rm /data/.verify_access || true
-
 if [[ $PROXY ]]; then
     export http_proxy="$PROXY"
     export https_proxy="$PROXY"
@@ -102,7 +95,11 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployFabric "$@"
   ;;
 
-  FTB|CURSEFORGE)
+  FTBA)
+    exec ${SCRIPTS:-/}start-deployFTBA "$@"
+  ;;
+
+  CURSEFORGE|FTB)
     exec ${SCRIPTS:-/}start-deployCF "$@"
   ;;
 

start-deployCF

@@ -5,11 +5,9 @@ set -e
 . ${SCRIPTS:-/}start-utils
 isDebugging && set -x
 
-: ${FTB_BASE_DIR:=${CF_BASE_DIR:-/data/FeedTheBeast}}
+export FTB_BASE_DIR=/data/FeedTheBeast
-export FTB_BASE_DIR
-
 legacyJavaFixerUrl=https://ftb.forgecdn.net/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
-export TYPE=FEED-THE-BEAST
+export TYPE=CURSEFORGE
 
 FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
 

start-deployCustom

@@ -17,16 +17,12 @@ if isURL ${CUSTOM_SERVER}; then
   fi
 
 elif [[ -f ${CUSTOM_SERVER} ]]; then
-  export SERVER=${CUSTOM_SERVER}
+  log "Using custom server jar at ${CUSTOM_SERVER} ..."
-
-elif [[ ${GENERIC_PACK} ]]; then
-  log "Using custom server jar from generic pack at ${CUSTOM_SERVER} ..."
   export SERVER=${CUSTOM_SERVER}
 
 else
   log "CUSTOM_SERVER is not properly set to a URL or existing jar file"
   exit 2
-
 fi
 
 export SKIP_LOG4J_CONFIG=true

start-deployFTBA

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+ftbInstallMarker=".ftb-installed"
+
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
+set -e
+
+if ! [[ -v FTB_MODPACK_ID ]]; then
+  log "ERROR FTB_MODPACK_ID is required with TYPE=FTB"
+  exit 1
+fi
+
+if ! [[ ${FTB_MODPACK_ID} =~ [0-9]+ ]]; then
+  log "ERROR FTB_MODPACK_ID needs to be numeric"
+  exit 1
+fi
+
+if ! [[ -v 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
+  fi
+elif ! [[ ${FTB_MODPACK_VERSION_ID} =~ [0-9]+ ]]; then
+  log "ERROR FTB_MODPACK_VERSION_ID needs to be numeric"
+  exit 1
+fi
+
+if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" ]; then
+  ftbInstaller=/data/ftb-installer
+  if ! [[ -f "${ftbInstaller}" ]]; then
+    log "Downloading FTB installer"
+    curl -fsSL https://api.modpacks.ch/public/modpack/1/1/server/linux -o "${ftbInstaller}"
+    chmod +x "${ftbInstaller}"
+  fi
+
+  rm -rf forge*jar mods config libraries defaultconfigs changelogs
+
+  log "Installing modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID}"
+  ${ftbInstaller} ${FTB_MODPACK_ID} ${FTB_MODPACK_VERSION_ID} --noscript --auto
+  rm -f forge*installer.jar
+
+  echo "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" > ${ftbInstallMarker}
+
+  writeEula
+else
+  log "FTB modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID} is ready to go"
+fi
+
+isDebugging && cat version.json
+forgeVersion=$(jq -r '.targets[] | select(.name == "forge") | .version' version.json)
+mcVersion=$(jq -r '.targets[] | select(.name == "minecraft") | .version' version.json)
+
+variants=(
+  forge-${mcVersion}-${forgeVersion}.jar
+  forge-${mcVersion}-${forgeVersion}-universal.jar
+  forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar
+)
+for f in ${variants[@]}; do
+  if [ -f $f ]; then
+    export SERVER=$f
+    break
+  fi
+done
+if ! [ -v SERVER ]; then
+  log "ERROR unable to locate the installed forge server jar"
+  ls *.jar
+  exit 2
+fi
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-deployPaper

@@ -4,66 +4,54 @@
 set -o pipefail
 isDebugging && set -x
 
-if [[ $PAPER_DOWNLOAD_URL ]]; then
+# PaperMC API v2 docs : https://papermc.io/api/docs/swagger-ui/index.html?configUrl=/api/openapi/swagger-config
-  export SERVER=$(getFilenameFromUrl "${PAPER_DOWNLOAD_URL}")
 
-  if [ -f "$SERVER" ]; then
+build=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
-    zarg=(-z "$SERVER")
+ | jq '.builds[-1]')
-  fi
+case $? in
-
+  0)
-  echo "Preparing custom PaperMC jar from $PAPER_DOWNLOAD_URL"
+    ;;
-
+  22)
-  curl -fsSL -o "$SERVER" "${zarg[@]}" "${PAPER_DOWNLOAD_URL}"
+    versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
-else
+    if [[ $VERSION = LATEST ]]; then
-  # PaperMC API v2 docs : https://papermc.io/api/docs/swagger-ui/index.html?configUrl=/api/openapi/swagger-config
+        VANILLA_VERSION=$(echo "$versions" | jq -r '.versions[-1]')
-
+        log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
-  build=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
+        # re-execute the current script with the newly computed version
-   | jq '.builds[-1]')
+        exec $0 "$@"
-  case $? in
+    fi
-    0)
+    log "ERROR: ${VANILLA_VERSION} is not published by PaperMC"
-      ;;
+    log "       Set VERSION to one of the following: "
-    22)
+    log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
-      versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
-      if [[ $VERSION = LATEST ]]; then
-          VANILLA_VERSION=$(echo "$versions" | jq -r '.versions[-1]')
-          log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
-          # re-execute the current script with the newly computed version
-          exec $0 "$@"
-      fi
-      log "ERROR: ${VANILLA_VERSION} is not published by PaperMC"
-      log "       Set VERSION to one of the following: "
-      log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
-      exit 1
-      ;;
-    *)
-      echo "ERROR: unknown error while looking up PaperMC version=${VANILLA_VERSION}"
-      exit 1
-      ;;
-  esac
-  if [ $? != 0 ]; then
-    echo "ERROR: failed to lookup PaperMC build from version ${VANILLA_VERSION}"
     exit 1
-  fi
+    ;;
-
+  *)
-  export SERVER=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}" -H  "accept: application/json" \
+    echo "ERROR: unknown error while looking up PaperMC version=${VANILLA_VERSION}"
-   | jq -r '.downloads.application.name')
-  if [ $? != 0 ]; then
-    echo "ERROR: failed to lookup PaperMC download file from version=${VANILLA_VERSION} build=${build}"
     exit 1
-  fi
+    ;;
+esac
+if [ $? != 0 ]; then
+  echo "ERROR: failed to lookup PaperMC build from version ${VANILLA_VERSION}"
+  exit 1
+fi
 
-  if [ -f "$SERVER" ]; then
+export SERVER=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}" -H  "accept: application/json" \
-    zarg=(-z "$SERVER")
+ | jq -r '.downloads.application.name')
-  fi
+if [ $? != 0 ]; then
+  echo "ERROR: failed to lookup PaperMC download file from version=${VANILLA_VERSION} build=${build}"
+  exit 1
+fi
 
-  log "Downloading PaperMC $VANILLA_VERSION (build $build) ..."
+if [ -f "$SERVER" ]; then
-  curl -fsSL -o "$SERVER" "${zarg[@]}" \
+  zarg=(-z "$SERVER")
-    "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}/downloads/${SERVER}" \
+fi
-    -H  "accept: application/java-archive"
+
-  if [ $? != 0 ]; then
+log "Downloading PaperMC $VANILLA_VERSION (build $build) ..."
-    echo "ERROR: failed to download PaperMC from version=${VANILLA_VERSION} build=${build} download=${SERVER}"
+curl -fsSL -o "$SERVER" "${zarg[@]}" \
-    exit 1
+  "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}/downloads/${SERVER}" \
-  fi
+  -H  "accept: application/java-archive"
+if [ $? != 0 ]; then
+  echo "ERROR: failed to download PaperMC from version=${VANILLA_VERSION} build=${build} download=${SERVER}"
+  exit 1
 fi
 
 # Normalize on Spigot for downstream operations

start-finalSetupModconfig

@@ -24,4 +24,4 @@ case "X$MODCONFIG" in
 esac
 fi
 
-exec ${SCRIPTS:-/}start-finalSetupMounts $@
+exec ${SCRIPTS:-/}start-finalSetupPlugins $@

start-finalSetupModpack

@@ -19,13 +19,8 @@ if isTrue ${REMOVE_OLD_MODS}; then
       ;;
   esac
 
-  # only try to remove existing mods dir
+  log "Removing old mods in $remove_mods_dest..."
-  if [ -d "$remove_mods_dest" ]; then
+  find $remove_mods_dest -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete
-    log "Removing old mods in $remove_mods_dest..."
-    find $remove_mods_dest -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete
-  else
-    log "Directory $remove_mods_dest does not exist; removing nothing."
-  fi
 fi
 
 # If supplied with a URL for a modpack (simple zip of jars), download it and unpack
@@ -153,8 +148,7 @@ if [[ "${GENERIC_PACK}" ]]; then
   if ! sha256sum -c ${sum_file} -s 2> /dev/null; then
     base_dir=/tmp/generic_pack_base
     mkdir -p ${base_dir}
-    isDebugging && ls -l "${GENERIC_PACK}"
+    unzip -q -d ${base_dir} ${GENERIC_PACK}
-    unzip -q -d ${base_dir} "${GENERIC_PACK}"
     if [ -f /data/manifest.txt ]; then
       log "Manifest exists from older generic pack, cleaning up ..."
       while read f; do
@@ -172,7 +166,7 @@ if [[ "${GENERIC_PACK}" ]]; then
     for d in $(find ${base_dir} -type d); do mkdir -p "$(sed "s#${base_dir}#/data#" <<< $d)"; done
     for f in $(find ${base_dir} -type f); do cp -f "$f" "$(sed "s#${base_dir}#/data#" <<< $f)"; done
     rm -rf ${base_dir}
-    sha256sum "${GENERIC_PACK}" > ${sum_file}
+    sha256sum ${GENERIC_PACK} > ${sum_file}
   fi
 fi
 

start-finalSetupMounts

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. ${SCRIPTS:-/}start-utils
-
-: ${PLUGINS_SYNC_UPDATE:=true}
-
-isDebugging && set -x
-
-if [ -d /plugins ]; then
-  case ${TYPE} in
-    SPIGOT|BUKKIT|PAPER|MAGMA)
-      mkdir -p /data/plugins
-      log "Copying plugins over..."
-      if isTrue ${PLUGINS_SYNC_UPDATE}; then
-        updateArg="--update"
-      fi
-      # Copy plugins over using rsync to allow deeply nested updates of plugins
-      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs $updateArg /plugins /data
-      ;;
-  esac
-fi
-
-# If any modules have been provided, copy them over
-if [ -d /mods ]; then
-  log "Copying any mods over..."
-  mkdir -p /data/mods
-  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods /data
-fi
-
-: ${COPY_CONFIG_DEST:="/data/config"}
-
-if [ -d /config ]; then
-  log "Copying any configs from /config to $COPY_CONFIG_DEST"
-  mkdir -p $COPY_CONFIG_DEST
-  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /config/ $COPY_CONFIG_DEST
-fi
-
-exec ${SCRIPTS:-/}start-finalSetupServerProperties $@

start-finalSetupPlugins

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+: ${PLUGINS_SYNC_UPDATE:=true}
+
+isDebugging && set -x
+
+if [ -d /plugins ]; then
+  case ${TYPE} in
+    SPIGOT|BUKKIT|PAPER)
+      mkdir -p /data/plugins
+      log "Copying plugins over..."
+      if isTrue ${PLUGINS_SYNC_UPDATE}; then
+        updateArg="--update"
+      fi
+      # Copy plugins over using rsync to allow deeply nested updates of plugins
+      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs $updateArg /plugins /data
+      ;;
+  esac
+fi
+
+exec ${SCRIPTS:-/}start-finalSetupServerProperties $@

start-finalSetupServerProperties

@@ -13,7 +13,7 @@ function setServerProp {
         var=${var,,} ;;
     esac
     log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
-    sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
+    sed -i "/^${prop}\s*=/ c ${prop}=${var}" "$SERVER_PROPERTIES"
   else
     log "Skip setting ${prop}"
   fi

start-minecraftFinalSetup

@@ -2,6 +2,8 @@
 
 . ${SCRIPTS:-/}start-utils
 
+: ${COPY_CONFIG_DEST:="/data/config"}
+
 if [ -n "$OPS" ]; then
   log "Setting/adding ops"
   rm -rf /data/ops.txt.converted
@@ -49,6 +51,20 @@ for j in $JSON_FILES; do
   fi
 done
 
+
+# If any modules have been provided, copy them over
+if [ -d /mods ]; then
+  log "Copying any mods over..."
+  mkdir -p /data/mods
+  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods /data
+fi
+
+if [ -d /config ]; then
+  log "Copying any configs from /config to $COPY_CONFIG_DEST"
+  mkdir -p $COPY_CONFIG_DEST
+  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /config/ $COPY_CONFIG_DEST
+fi
+
 EXTRA_ARGS=""
 # Optional disable console
 if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
@@ -164,7 +180,7 @@ if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
     exec mc-server-runner ${mcServerRunnerArgs} \
       --cf-instance-file "${CURSE_INSTANCE_JSON}" \
       java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "FEED-THE-BEAST" && "${SERVER}" ]]; then
+elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
   copyFilesForCurseForge
 
   cd "${FTB_DIR}"
@@ -173,7 +189,7 @@ elif [[ ${TYPE} == "FEED-THE-BEAST" && "${SERVER}" ]]; then
     set -x
   fi
   exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
+elif [[ ${TYPE} == "CURSEFORGE" ]]; then
   mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
 
   copyFilesForCurseForge