Auto-merging via docker-versions-create

Fixes #415

.github/workflows/build-multiarch.yml

@@ -0,0 +1,25 @@
+name: Build and publish multiarch
+on:
+  push:
+    branches:
+      - multiarch
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
+
+jobs:
+  docker-buildx:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.2.0
+      - name: Get branch name
+        uses: nelonoel/branch-name@v1
+      - name:  Docker Buildx
+        uses: ilteoood/docker_buildx@1.0.4
+        with:
+          publish: true
+          imageName: itzg/minecraft-server
+          tag: ${{ env.BRANCH_NAME }}
+          dockerHubUser: ${{ secrets.DOCKER_USER }}
+          dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}
+

.github/workflows/main.yml

@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: Build non-multiarch branches/tags
+name: Build and publish non-multiarch branches/tags
 
 on:
   push:
@@ -36,4 +36,4 @@ jobs:
         tag_with_sha: true
         cache_froms: itzg/minecraft-server:latest
         add_git_labels: true
-        push: false
+        push: true

BUILDING.md

@@ -0,0 +1,5 @@
+Ensure buildx/BuildKit support is enabled and run:
+
+```
+docker buildx build --platform=linux/arm64 --platform=linux/arm/v7 --platform=linux/amd64 --tag itzg/minecraft-server:multiarch --push .
+```

DEVELOPMENT.md

@@ -1,4 +1,17 @@
-Individual scripts can be iteratively developed and tested using the following procedure.
+## Adding a server type
+
+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
+2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-finalSetup01World` 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)
+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)
+
+## Iterative script development
+
+Individual scripts can be iteratively developed, debugged, and tested using the following procedure.
 
 First, build a baseline of the image to include the packages needed by existing or new scripts:
 
@@ -9,7 +22,7 @@ docker build -t mc-dev .
 Using the baseline image, an interactive container can be started to iteratively run the scripts to be developed. By attaching the current workspace directory, you can use the local editor of your choice to iteratively modify scripts while using the container to run them.
 
 ```shell script
-docker run -it --rm -v ${PWD}:/scripts -e SCRIPTS=/scripts/ --entrypoint bash mc-dev 
+docker run -it --rm -v ${PWD}:/scripts -e SCRIPTS=/scripts/ --entrypoint bash mc-dev
 ```
 
 From within the container you can run individual scripts via the attached `/scripts/` path; however, be sure to set any environment variables expected by the scripts by either `export`ing them manually:
@@ -26,3 +39,36 @@ VANILLA_VERSION=1.12.2 /scripts/start-magma
 ```
 
 > NOTE: You may want to temporarily add an `exit` statement near the end of your script to isolate execution to just the script you're developing.
+
+## Multi-base-image variants
+
+Several base-image variants are maintained in order to offer choices in JDK provider and version. The variants are maintained in their respective branches:
+- openj9 
+- openj9-nightly
+- adopt11
+- adopt13
+- multiarch
+
+The [docker-versions-create.sh](docker-versions-create.sh) script is configured with the branches to maintain and is used to merge changes from the master branch into the mulit-base variant branches. The script also manages git tagging the master branch along with the merged branches. So a typical use of the script would be like:
+
+```shell script
+./docker-versions-create.sh -s -t 1.2.0
+```
+
+> Most often the major version will be bumped unless a bug or hotfix needs to be published in which case the patch version should be incremented.
+
+> The build and publishing of those branches and their tags is currently performed within Docker Hub.
+
+## multiarch support
+
+The [multiarch branch](https://github.com/itzg/docker-minecraft-server/tree/multiarch) supports running the image on amd64, arm64, and armv7 (aka RaspberryPi). Unlike the mainline branches, it is based on Ubuntu 18.04 since the openjdk package provided by Ubuntu includes full JIT support on all of the processor types.
+
+The multiarch images are built and published by [a Github action](https://github.com/itzg/docker-minecraft-server/actions?query=workflow%3A%22Build+and+publish+multiarch%22), which [is configured in that branch](https://github.com/itzg/docker-minecraft-server/blob/multiarch/.github/workflows/build-multiarch.yml).
+
+## Generating release notes
+
+The following git command can be used to provide the bulk of release notes content:
+
+```shell script
+git log --invert-grep --grep "^ci:" --grep "^misc:" --pretty="- %s" 1.1.0..1.2.0
+```

Dockerfile

@@ -1,29 +1,27 @@
-FROM openjdk:8u212-jre-alpine
+FROM ubuntu:18.04
 
 LABEL maintainer "itzg"
 
-RUN apk add --no-cache -U \
-  openssl \
-  imagemagick \
-  lsof \
-  su-exec \
-  shadow \
-  bash \
-  curl iputils wget \
-  git \
-  jq \
-  mysql-client \
-  tzdata \
-  rsync \
-  nano \
-  sudo \
-  knock \
-  ttf-dejavu
+RUN apt-get update \
+  && 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 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
+RUN addgroup --gid 1000 minecraft \
+  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
 
 COPY files/sudoers* /etc/sudoers.d
 
@@ -31,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 TARGETARCH=amd64
-ARG TARGETVARIANT=""
+ARG TARGETOS
+ARG TARGETARCH
+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
@@ -67,7 +65,7 @@ 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" \

README.md

@@ -534,6 +534,15 @@ A [Mohist](https://github.com/Mohist-Community/Mohist) server can be used with
 
 > **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2"
 
+
+## Running a Catserver type server
+
+A [Catserver](http://catserver.moe/) type server can be used with
+
+    -e TYPE=CATSERVER
+
+> **NOTE** Catserver only provides a single release stream, so `VERSION` is ignored
+
 ## Running a server with a Feed the Beast modpack
 
 > **NOTE** requires `itzg/minecraft-server:multiarch` image

build-multiarch.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-# manually purge any pre-existing manifest list
-# since docker manifest command lacks a "remove" operation
-rm -rf ~/.docker/manifests/docker.io_itzg_minecraft-server-multiarch
-
-export DOCKER_BUILDKIT=1
-
-docker build --platform linux/arm64 -t itzg/minecraft-server:arm64 .
-docker push itzg/minecraft-server:arm64
-
-armv7tag=armv7-buildkit
-armv7workDir=/tmp/armv7-$$
-git worktree add $armv7workDir armv7
-# sub-shell for build of armv7
-(
-  cd $armv7workDir
-  docker build --platform linux/arm/v7 -t itzg/minecraft-server:$armv7tag .
-  docker push itzg/minecraft-server:$armv7tag
-)
-git worktree remove $armv7workDir
-
-docker pull itzg/minecraft-server
-# use the rpi build one for now since armv7-buildkit is giving ABI mismatch on curl
-docker pull itzg/minecraft-server:armv7
-
-docker manifest create itzg/minecraft-server:multiarch \
-  itzg/minecraft-server \
-  itzg/minecraft-server:armv7 \
-  itzg/minecraft-server:arm64
-
-docker manifest inspect itzg/minecraft-server:multiarch
-
-docker manifest push -p itzg/minecraft-server:multiarch

development/update-multiarch.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-manifest="itzg/minecraft-server:multiarch"
-
-for t in latest rpi3 aarch64; do
-    docker pull itzg/minecraft-server:$t
-done
-
-docker manifest create --amend ${manifest} \
-  itzg/minecraft-server:aarch64 \
-  itzg/minecraft-server:latest \
-  itzg/minecraft-server:rpi3
-
-docker manifest annotate --os linux --arch amd64 ${manifest} itzg/minecraft-server:latest
-docker manifest annotate --os linux --arch arm64 ${manifest} itzg/minecraft-server:aarch64
-docker manifest annotate --os linux --arch arm --variant v7 ${manifest} itzg/minecraft-server:rpi3
-
-docker manifest push ${manifest}

docker-versions-create.sh

@@ -10,7 +10,7 @@ function TrapExit {
 
 batchMode=false
 
-while getopts "hbt:" arg
+while getopts "hbt:s" arg
 do
   case $arg in
     b)
@@ -19,6 +19,9 @@ do
     t)
       tag=${OPTARG}
       ;;
+    s)
+      tagArgs="-s -m 'Signed during docker-versions-create"
+      ;;
     h)
       echo "
 Usage $0 [options]
@@ -28,6 +31,7 @@ Options:
           when any merge fails
   -t TAG  tag and push the current revision on master with the given tag
           and apply respective tags to each branch
+  -s      enable signed tags
   -h      display this help and exit
 "
       exit

start

@@ -45,7 +45,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-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
   EULA="${EULA,,}"
   if [ "$EULA" != "true" ]; then
@@ -28,18 +30,10 @@ 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"
+    export JAVA_TOOL_OPTIONS+="-Djava.net.useSystemProxies=true"
     log "INFO: Giving proxy time to startup..."
     sleep 5
 fi
@@ -94,10 +88,14 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployFabric "$@"
   ;;
 
-  FTB|CURSEFORGE)
+  FTBA)
     exec ${SCRIPTS:-/}start-deployFTB "$@"
   ;;
 
+  CURSEFORGE|FTB)
+    exec ${SCRIPTS:-/}start-deployCF "$@"
+  ;;
+
   VANILLA)
     exec ${SCRIPTS:-/}start-deployVanilla "$@"
   ;;
@@ -115,11 +113,15 @@ case "${TYPE^^}" in
   ;;
 
   MAGMA)
-    exec ${SCRIPTS:-/}start-magma "$@"
+    exec ${SCRIPTS:-/}start-deployMagma "$@"
   ;;
 
   MOHIST)
-    exec ${SCRIPTS:-/}start-mohist "$@"
+    exec ${SCRIPTS:-/}start-deployMohist "$@"
+  ;;
+
+  CATSERVER)
+    exec ${SCRIPTS:-/}start-deployCatserver "$@"
   ;;
 
   *)

start-deployCF

@@ -0,0 +1,133 @@
+#!/bin/bash
+
+. /start-utils
+
+export FTB_BASE_DIR=/data/FeedTheBeast
+legacyJavaFixerUrl=http://ftb.cursecdn.com/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
+export TYPE=CURSEFORGE
+
+FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
+
+log "Looking for CurseForge server modpack."
+if [[ -z $FTB_SERVER_MOD ]]; then
+    log "Environment variable FTB_SERVER_MOD not set."
+    log "Set FTB_SERVER_MOD to the file name of the FTB server modpack."
+    log "(And place the modpack in the /data directory.)"
+    exit 2
+fi
+
+entryScriptExpr="-name ServerStart.sh -o -name ServerStartLinux.sh -o -name LaunchServer.sh"
+
+if [[ -d ${FTB_BASE_DIR} ]]; then
+  startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l)
+  if [[ $startScriptCount > 1 ]]; then
+    log "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
+    exit 2
+  fi
+else
+  startScriptCount=0
+fi
+
+# only download and install if a mod pack isn't already installed
+# also check for the start script rather than just the folder
+# this allows saving just the world separate from the rest of the data directory
+if [[ $startScriptCount = 0 ]]; then
+  srv_modpack=${FTB_SERVER_MOD}
+  if isURL ${srv_modpack}; then
+      case $srv_modpack in
+        https://www.feed-the-beast.com/*/download|https://www.curseforge.com/minecraft/modpacks/*/download/*/file)
+          ;;
+        https://www.curseforge.com/minecraft/modpacks/*/download/*)
+          srv_modpack=${srv_modpack}/file;;
+        https://www.feed-the-beast.com/*)
+          srv_modpack=${srv_modpack}/download;;
+      esac
+      file=$(basename $(dirname $srv_modpack))
+      downloaded=/data/${file}.zip
+      if [ ! -e $downloaded ]; then
+        log "Downloading FTB modpack...
+  $srv_modpack -> $downloaded"
+        curl -sSL -o $downloaded $srv_modpack
+      fi
+      srv_modpack=$downloaded
+  fi
+  if [[ ${srv_modpack:0:5} == "data/" ]]; then
+      # Prepend with "/"
+      srv_modpack=/${srv_modpack}
+  fi
+  if [[ ! ${srv_modpack:0:1} == "/" ]]; then
+      # If not an absolute path, assume file is in "/data"
+      srv_modpack=/data/${srv_modpack}
+  fi
+  if [[ ! -f ${srv_modpack} ]]; then
+      log "FTB server modpack ${srv_modpack} not found."
+      exit 2
+  fi
+  if [[ ! ${srv_modpack: -4} == ".zip" ]]; then
+      log "FTB server modpack ${srv_modpack} is not a zip archive."
+      log "Please set FTB_SERVER_MOD to a file with a .zip extension."
+      exit 2
+  fi
+
+  log "Unpacking FTB server modpack ${srv_modpack} ..."
+  mkdir -p ${FTB_BASE_DIR}
+  unzip -o ${srv_modpack} -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
+fi
+
+if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
+
+    # Allow up to 2 levels since some modpacks have a top-level directory named
+    # for the modpack
+    forgeJar=$(find ${FTB_BASE_DIR} -maxdepth 2 -name 'forge*.jar' -a -not -name 'forge*installer')
+    if [[ "$forgeJar" ]]; then
+      export FTB_BASE_DIR=$(dirname "${forgeJar}")
+      log "No entry script found, so building one for ${forgeJar}"
+      cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
+#!/bin/sh
+. ./settings-local.sh
+java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar $(basename "${forgeJar}") nogui
+EOF
+      chmod +x "${FTB_BASE_DIR}/ServerStart.sh"
+    else
+      log "Please make sure you are using the server version of the FTB modpack!"
+      exit 2
+    fi
+fi
+
+scriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l)
+if [[ $scriptCount = 0 ]]; then
+    log "Please make sure you are using the server version of the FTB modpack!"
+    exit 2
+elif [[ $scriptCount > 1 ]]; then
+    log "Ambigous startup scripts in FTB modpack!"
+    log "found:"
+    find ${FTB_BASE_DIR} $entryScriptExpr
+    exit 2
+fi
+
+export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
+
+export FTB_DIR=$(dirname "${FTB_SERVER_START}")
+chmod a+x "${FTB_SERVER_START}"
+grep fml.queryResult=confirm ${FTB_SERVER_START} > /dev/null || \
+    sed -i 's/-jar/-Dfml.queryResult=confirm -jar/' "${FTB_SERVER_START}"
+sed -i 's/.*read.*Restart now/#\0/' "${FTB_SERVER_START}"
+legacyJavaFixerPath="${FTB_DIR}/mods/legacyjavafixer.jar"
+
+if isTrue ${FTB_LEGACYJAVAFIXER} && [ ! -e "${legacyJavaFixerPath}" ]; then
+  log "Installing legacy java fixer to ${legacyJavaFixerPath}"
+  curl -sSL -o "${legacyJavaFixerPath}" ${legacyJavaFixerUrl}
+fi
+
+if [ -e "${FTB_DIR}/FTBInstall.sh" ]; then
+  pushd "${FTB_DIR}"
+  sh FTBInstall.sh
+  popd
+elif [ -e "${FTB_DIR}/Install.sh" ]; then
+  pushd "${FTB_DIR}"
+  sh Install.sh
+  popd
+fi
+
+# Continue to Final Setup
+exec /start-finalSetup01World $@

start-deployCatserver

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+set -o pipefail
+set -e
+
+latestAsset=$(
+  curl -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/latest | \
+    jq '.assets[] | select(.name | match(".*-universal.jar"))'
+)
+
+if [[ -z "${latestAsset}" ]]; then
+  log "ERROR: latest release of Catserver is missing universal.jar asset"
+  exit 1
+fi
+
+isDebugging && log "Latest asset ${latestAsset}"
+latestJarName=$(echo ${latestAsset} | jq --raw-output '.name')
+latestJarId=$(echo ${latestAsset} | jq --raw-output '.id')
+
+
+export SERVER="/data/${latestJarName}"
+
+if [ ! -f ${SERVER} ]; then
+  log "Downloading ${latestJarName}"
+  curl -H "Accept:application/octet-stream" -o "$SERVER" -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/assets/${latestJarId}
+fi
+
+export SKIP_LOG4J_CONFIG=true
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetup01World "$@"

start-deployFTB

@@ -1,138 +1,70 @@
 #!/bin/bash
 
+ftbInstallMarker=".ftb-installed"
+
 . ${SCRIPTS:-/}start-utils
+isDebugging && set -x
+set -e
 
-export FTB_BASE_DIR=/data/FeedTheBeast
-legacyJavaFixerUrl=http://ftb.cursecdn.com/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
-export TYPE=FEED-THE-BEAST
-
-FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
-
-log "Looking for Feed-The-Beast / CurseForge server modpack."
-if [[ -z $FTB_SERVER_MOD ]]; then
-    log "Environment variable FTB_SERVER_MOD not set."
-    log "Set FTB_SERVER_MOD to the file name of the FTB server modpack."
-    log "(And place the modpack in the /data directory.)"
-    exit 2
+if ! [[ -v FTB_MODPACK_ID ]]; then
+  log "ERROR FTB_MODPACK_ID is required with TYPE=FTB"
+  exit 1
 fi
 
-entryScriptExpr="
-  -name ServerStart.sh
-  -o -name ServerStartLinux.sh
-  -o -name LaunchServer.sh
-  -o -name server-start.sh
-  "
+if ! [[ ${FTB_MODPACK_ID} =~ [0-9]+ ]]; then
+  log "ERROR FTB_MODPACK_ID needs to be numeric"
+  exit 1
+fi
 
-if [[ -d ${FTB_BASE_DIR} ]]; then
-  startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l)
-  if [[ $startScriptCount > 1 ]]; then
-    log "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
-    exit 2
+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}
 else
-  startScriptCount=0
+  log "FTB modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID} is ready to go"
 fi
 
-# only download and install if a mod pack isn't already installed
-# also check for the start script rather than just the folder
-# this allows saving just the world separate from the rest of the data directory
-if [[ $startScriptCount = 0 ]]; then
-  srv_modpack=${FTB_SERVER_MOD}
-  if isURL ${srv_modpack}; then
-      case $srv_modpack in
-        https://www.feed-the-beast.com/*/download|https://www.curseforge.com/minecraft/modpacks/*/download/*/file)
-          ;;
-        https://www.curseforge.com/minecraft/modpacks/*/download/*)
-          srv_modpack=${srv_modpack}/file;;
-        https://www.feed-the-beast.com/*)
-          srv_modpack=${srv_modpack}/download;;
-      esac
-      file=$(basename $(dirname $srv_modpack))
-      downloaded=/data/${file}.zip
-      if [ ! -e $downloaded ]; then
-        log "Downloading FTB modpack...
-  $srv_modpack -> $downloaded"
-        curl -sSL -o $downloaded $srv_modpack
-      fi
-      srv_modpack=$downloaded
+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
-  if [[ ${srv_modpack:0:5} == "data/" ]]; then
-      # Prepend with "/"
-      srv_modpack=/${srv_modpack}
-  fi
-  if [[ ! ${srv_modpack:0:1} == "/" ]]; then
-      # If not an absolute path, assume file is in "/data"
-      srv_modpack=/data/${srv_modpack}
-  fi
-  if [[ ! -f ${srv_modpack} ]]; then
-      log "FTB server modpack ${srv_modpack} not found."
-      exit 2
-  fi
-  if [[ ! ${srv_modpack: -4} == ".zip" ]]; then
-      log "FTB server modpack ${srv_modpack} is not a zip archive."
-      log "Please set FTB_SERVER_MOD to a file with a .zip extension."
-      exit 2
-  fi
-
-  log "Unpacking FTB server modpack ${srv_modpack} ..."
-  mkdir -p ${FTB_BASE_DIR}
-  unzip -o ${srv_modpack} -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
-fi
-
-if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
-
-    # Allow up to 2 levels since some modpacks have a top-level directory named
-    # for the modpack
-    forgeJar=$(find ${FTB_BASE_DIR} -maxdepth 2 -name 'forge*.jar' -a -not -name 'forge*installer')
-    if [[ "$forgeJar" ]]; then
-      export FTB_BASE_DIR=$(dirname "${forgeJar}")
-      log "No entry script found, so building one for ${forgeJar}"
-      cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
-#!/bin/sh
-. ./settings-local.sh
-java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar $(basename "${forgeJar}") nogui
-EOF
-      chmod +x "${FTB_BASE_DIR}/ServerStart.sh"
-    else
-      log "Please make sure you are using the server version of the FTB modpack!"
-      exit 2
-    fi
-fi
-
-scriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l)
-if [[ $scriptCount = 0 ]]; then
-    log "Please make sure you are using the server version of the FTB modpack!"
-    exit 2
-elif [[ $scriptCount > 1 ]]; then
-    log "Ambigous startup scripts in FTB modpack!"
-    log "found:"
-    find ${FTB_BASE_DIR} $entryScriptExpr
-    exit 2
-fi
-
-export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
-
-export FTB_DIR=$(dirname "${FTB_SERVER_START}")
-chmod a+x "${FTB_SERVER_START}"
-grep fml.queryResult=confirm ${FTB_SERVER_START} > /dev/null || \
-    sed -i 's/-jar/-Dfml.queryResult=confirm -jar/' "${FTB_SERVER_START}"
-sed -i 's/.*read.*Restart now/#\0/' "${FTB_SERVER_START}"
-legacyJavaFixerPath="${FTB_DIR}/mods/legacyjavafixer.jar"
-
-if isTrue ${FTB_LEGACYJAVAFIXER} && [ ! -e "${legacyJavaFixerPath}" ]; then
-  log "Installing legacy java fixer to ${legacyJavaFixerPath}"
-  curl -sSL -o "${legacyJavaFixerPath}" ${legacyJavaFixerUrl}
-fi
-
-if [ -e "${FTB_DIR}/FTBInstall.sh" ]; then
-  pushd "${FTB_DIR}"
-  sh FTBInstall.sh
-  popd
-elif [ -e "${FTB_DIR}/Install.sh" ]; then
-  pushd "${FTB_DIR}"
-  sh Install.sh
-  popd
+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-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World "$@"

start-deployMohist

@@ -1,17 +1,19 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
-requireVar VANILLA_VERSION
 set -o pipefail
 set -e
 isDebugging && set -x
 
+requireVar VANILLA_VERSION
+
 mohistJobs=https://ci.codemc.io/job/Mohist-Community/job/
 mohistJob=${mohistJobs}Mohist-${VANILLA_VERSION}/
 
 if ! curl -X HEAD -o /dev/null -fsSL "${mohistJob}"; then
   log "ERROR: mohist builds do not exist for ${VANILLA_VERSION}"
   log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
+  log "       and set VERSION accordingly"
   exit 1
 fi
 
@@ -24,17 +26,18 @@ baseName=$(basename "${latestBuildRelPath}")
 if [[ ${baseName} != *-server.jar* ]]; then
   log "ERROR: mohist build for ${VANILLA_VERSION} is not a valid server jar, found ${baseName}"
   log "       check https://ci.codemc.io/job/Mohist-Community/ for available versions"
+  log "       and set VERSION accordingly"
   exit 1
 fi
 
 export SERVER="/data/${baseName}"
 
 if [ ! -f ${SERVER} ]; then
-  log "Downloading ${SERVER}"
+  log "Downloading ${baseName}"
   curl -o "${SERVER}" -fsSL "${mohistJob}lastSuccessfulBuild/artifact/${latestBuildRelPath}"
 fi
 
 export SKIP_LOG4J_CONFIG=true
 
 # Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetup01World $@
+exec ${SCRIPTS:-/}start-finalSetup01World "$@"

start-minecraftFinalSetup

@@ -179,7 +179,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" ]]; then
+elif [[ ${TYPE} == "CURSEFORGE" ]]; then
     mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
 
     if [ ! -e "${FTB_DIR}/ops.json" -a -e /data/ops.txt ]; then