Auto-merging via docker-versions-create

#897

.github/workflows/build-multiarch.yml

@@ -66,7 +66,7 @@ jobs:
         uses: docker/build-push-action@v2.6.1
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           # ensure latest base image is used

DEVELOPMENT.md

@@ -70,5 +70,5 @@ The multiarch images are built and published by [a Github action](https://github
 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:" --grep "^docs:" --pretty="- %s" 1.1.0..1.2.0
+git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --grep "^build(deps)" --pretty="- %s" 1.1.0..1.2.0
 ```

Dockerfile

@@ -1,29 +1,29 @@
-FROM adoptopenjdk:8-jre-openj9
+FROM openjdk:8u212-jre-alpine
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
-RUN apt-get update \
-  && DEBIAN_FRONTEND=noninteractive \
-  apt-get install -y \
+RUN apk add --no-cache -U \
+  openssl \
     imagemagick \
-    gosu \
-    sudo \
-    net-tools \
-    curl wget \
+  lsof \
+  su-exec \
+  shadow \
+  bash \
+  curl iputils wget \
     git \
     jq \
-    dos2unix \
     mysql-client \
     tzdata \
     rsync \
     nano \
-    unzip \
-    knockd \
-    ttf-dejavu \
-    && apt-get clean
+  sudo \
+  knock \
+  ttf-dejavu
 
-RUN addgroup --gid 1000 minecraft \
-  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
+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
 
@@ -31,9 +31,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
-ARG TARGETARCH
-ARG TARGETVARIANT
+ARG TARGETOS=linux
+ARG TARGETARCH=amd64
+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
@@ -52,7 +52,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=1.6.0 --var app=mc-server-runner --file {{.app}} \
+ --var version=1.5.0 --var app=mc-server-runner --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
@@ -69,7 +69,7 @@ WORKDIR /data
 STOPSIGNAL SIGTERM
 
 ENV UID=1000 GID=1000 \
-  MEMORY="1G" \
+  JVM_XX_OPTS="-XX:+UseG1GC" 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" \
@@ -84,6 +84,5 @@ RUN dos2unix /start* && chmod +x /start*
 RUN dos2unix /health.sh && chmod +x /health.sh
 RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
 
-
 ENTRYPOINT [ "/start" ]
 HEALTHCHECK --start-period=1m CMD /health.sh

README.md

@@ -13,11 +13,30 @@ To simply use the latest stable version, run
 
     docker run -d -it -p 25565:25565 -e EULA=TRUE itzg/minecraft-server
 
-where, in this case, the standard server port 25565, will be exposed on your host machine.
+where the standard server port, 25565, will be exposed on your host machine.
 
-> If you plan on running a server for a longer amount of time it is highly recommended using a management layer such as [Docker Compose](#using-docker-compose) or [Kubernetes](#deployment-templates-and-examples) to allow for incremental reconfiguration and image upgrades.
+If you want to serve up multiple Minecraft servers or just use an alternate port,
+change the host-side port mapping such as
 
-> Be sure to always include `-e EULA=TRUE` in your commands and container definitions, as Mojang/Microsoft requires EULA acceptance.
+    ... -p 25566:25565 ...
+
+will serve your Minecraft server on your host's port 25566 since the `-p` syntax is
+`host-port`:`container-port`.
+
+Speaking of multiple servers, it's handy to give your containers explicit names using `--name`, such as naming this one "mc"
+
+    ... --name mc itzg/minecraft-server
+
+With that you can easily view the logs, stop, or re-start the container:
+
+    docker logs -f mc
+        ( Ctrl-C to exit logs action )
+
+    docker stop mc
+
+    docker start mc
+
+> Be sure to always include `-e EULA=TRUE` in your commands, as Mojang/Microsoft requires EULA acceptance.
 
 By default, the container will download the latest version of the "vanilla" [Minecraft: Java Edition server](https://www.minecraft.net/en-us/download/server) provided by Mojang. The [`VERSION`](#versions) and the [`TYPE`](#server-types) can be configured to create many variations of desired Minecraft server. 
 
@@ -57,8 +76,8 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Upgrading](#upgrading)
       * [Example](#example)
    * [Running a server with a CurseForge modpack](#running-a-server-with-a-curseforge-modpack)
-      * [Modpack data directory](#modpack-data-directory)
-      * [Buggy start scripts](#buggy-start-scripts)
+         * [Modpack data directory](#modpack-data-directory)
+         * [Buggy start scripts](#buggy-start-scripts)
       * [Fixing "unable to launch forgemodloader"](#fixing-unable-to-launch-forgemodloader)
    * [Working with mods and plugins](#working-with-mods-and-plugins)
       * [Optional plugins, mods, and config attach points](#optional-plugins-mods-and-config-attach-points)
@@ -112,7 +131,6 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Memory Limit](#memory-limit)
       * [JVM Options](#jvm-options)
       * [Interactive and Color Console](#interactive-and-color-console)
-      * [Server Shutdown Options](#server-shutdown-options)
       * [OpenJ9 Specific Options](#openj9-specific-options)
       * [Enabling rolling logs](#enabling-rolling-logs)
    * [Timezone Configuration](#timezone-configuration)
@@ -127,7 +145,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: Sun Aug  1 17:09:36 UTC 2021 -->
+<!-- Added by: runner, at: Thu Jul 15 13:34:00 UTC 2021 -->
 
 <!--te-->
 
@@ -471,9 +489,7 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge
 
     -e TYPE=MAGMA
 
-By default, the "stable" channel is used, but you can set `MAGMA_CHANNEL` to "dev" to access dev channel versions.
-
-> **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2", "1.16.5", etc.
+> **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2"
 
 
 ### Running a Mohist server
@@ -604,13 +620,13 @@ 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
+#### 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
+#### 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`.
 
@@ -1211,12 +1227,6 @@ If you would like to `docker attach` to the Minecraft server console with color
 > 
 > Make to enable stdin and tty with `-it` when using `docker run` or `stdin_open: true` and `tty: true` when using docker compose.
 
-### Server Shutdown Options
-
-To allow time for players to finish what they're doing during a graceful server shutdown, set `STOP_SERVER_ANNOUNCE_DELAY` to a number of seconds to delay after an announcement is posted by the server.
-
-> **NOTE** be sure to adjust Docker's shutdown timeout accordingly, such as using [the -t option on docker-compose down](https://docs.docker.com/compose/reference/down/).
-
 ### OpenJ9 Specific Options
 
 The openj9 image tags include specific variables to simplify configuration:

files/autopause/autopause-fcns.sh

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

files/autopause/knockd-config.cfg

@@ -3,10 +3,10 @@
 [unpauseMCServer-server]
  sequence = 25565
  seq_timeout = 1
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
  tcpflags = syn
 [unpauseMCServer-rcon]
  sequence = 25575
  seq_timeout = 1
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
  tcpflags = syn

files/autopause/pause.sh

@@ -2,7 +2,7 @@
 
 . /start-utils
 
-if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
+if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; then
   # save world
   rcon-cli save-all >/dev/null
 

files/autopause/resume.sh

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

start

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

start-configuration

@@ -56,7 +56,7 @@ fi
 
 if ! which java > /dev/null; then
   log "Fixing PATH to include java"
-  PATH="${PATH}:/opt/java/openjdk/bin"
+  PATH="${PATH}:/usr/bin"
 fi
 
 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
@@ -105,10 +105,6 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployFabric "$@"
   ;;
 
-  FTBA)
-    exec ${SCRIPTS:-/}start-deployFTBA "$@"
-  ;;
-
   FTB|CURSEFORGE)
     exec ${SCRIPTS:-/}start-deployCF "$@"
   ;;

start-deployAirplane

@@ -11,7 +11,6 @@ if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.16" ] && [ "${VERSION}"
 fi
 
 : ${AIRPLANE_BUILD:=lastSuccessfulBuild}
-: ${AIRPLANE_TYPE:=airplane}
 
 if  [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.17" ]; then
   AIRPLANE_BRANCH="1.17"
@@ -23,12 +22,10 @@ fi
 
 if [ "${VERSION}" = "PURPUR" ]; then
   AIRPLANE_BRANCH="Purpur-1.17"
-  AIRPLANE_TYPE="airplanepurpur"
 fi
 
 if [ "${VERSION}" = "PURPUR-1.16" ]; then
   AIRPLANE_BRANCH="Purpur-1.16"
-  AIRPLANE_TYPE="airplanepurpur"
 fi
 
 log "Using Airplane-${AIRPLANE_BRANCH} branch"
@@ -36,7 +33,7 @@ log "Using Airplane-${AIRPLANE_BRANCH} branch"
 export SERVER=airplane-${AIRPLANE_BRANCH}-${AIRPLANE_BUILD}.jar
 
 if [ ! -f "$SERVER" ] || isTrue "${FORCE_REDOWNLOAD:-false}"; then
-    downloadUrl="https://ci.tivy.ca/job/Airplane-${AIRPLANE_BRANCH}/${AIRPLANE_BUILD}/artifact/launcher-${AIRPLANE_TYPE}.jar"
+    downloadUrl="https://ci.tivy.ca/job/Airplane-${AIRPLANE_BRANCH}/${AIRPLANE_BUILD}/artifact/launcher-airplane.jar"
     log "Downloading Airplane from $downloadUrl ..."
     curl -fsSL -o "$SERVER" "$downloadUrl"
     if [ ! -f "$SERVER" ]; then

start-deployCF

@@ -84,6 +84,8 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
         exit 2
       fi
 
+      forgeInstallerJar=$(ls -t "${forgeInstallerJar}" | head -1)
+
       log "Installing forge server"
       dirOfInstaller=$(dirname "${forgeInstallerJar}")
       (cd "${dirOfInstaller}"; java -jar $(basename "${forgeInstallerJar}") --installServer)

start-deployForge

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
+export TYPE=FORGE
 : ${FORGEVERSION:=RECOMMENDED}
 isDebugging && set -x
 
@@ -46,7 +47,7 @@ elif [[ ! -e $FORGE_INSTALLER ]]; then
   log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
   exit 2
 else
-  shortForgeVersion=$VANILLA_VERSION-${FORGE_INSTALLER_CUSTOM_VERSION:-custom}
+  shortForgeVersion=$VANILLA_VERSION-custom
 fi
 
 installMarker="/data/.forge-installed-$shortForgeVersion"

start-deployMagma

@@ -1,93 +1,18 @@
 #!/bin/bash
 
 . ${SCRIPTS:-/}start-utils
-export SKIP_LOG4J_CONFIG=true
 
-isDebugging && set -x
+export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
 
-: ${VANILLA_VERSION?}
-# stable, dev
-: ${MAGMA_CHANNEL:=stable}
-
-
-magmaDownloadServer() {
-  url=${1?}
-  tagName=${2?}
-  markerFile=${3?}
-
-  export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
-
-  log "Downloading Magma server file for ${VANILLA_VERSION} @ ${tagName}"
-  if ! curl -o /data/magma-server-${VANILLA_VERSION}.jar -fsSL "$url"; then
-    log "ERROR failed to download Magma server from $url (status=$?)"
-    exit 1
-  fi
-
-  echo -n "$SERVER" > "$markerFile"
-}
-
-magmaHandleInstaller() {
-  url=${1?}
-  tagName=${2?}
-  markerFile=${3?}
-
-  installerFile="magma-installer-${VANILLA_VERSION}-${tagName}.jar"
-  log "Downloading Magma installer file for ${VANILLA_VERSION} @ ${tagName}"
-  if ! curl -o "$installerFile" -fsSL "$url"; then
-    log "ERROR failed to download Magma installer from $url (status=$?)"
-    exit 1
-  fi
-
-  echo "forge" > "$markerFile"
-
-  export FORGE_INSTALLER="$installerFile"
-  export FORGE_INSTALLER_CUSTOM_VERSION="$tagName"
-
-  # now hand off the rest to forge
-  exec ${SCRIPTS:-/}start-deployForge "$@"
-}
-
-latestMeta=$(curl -fsSL https://api.magmafoundation.org/api/resources/Magma/${VANILLA_VERSION}/${MAGMA_CHANNEL}/latest || exit $?)
-if [ $? != 0 ]; then
-  log "ERROR failed to locate latest Magma info for ${VANILLA_VERSION} in channel ${MAGMA_CHANNEL} (error=$?)"
+# Always download since new updates of each base version are published frequently
+if ! curl -o /data/magma-server-${VANILLA_VERSION}.jar -fsSL \
+  https://api.magmafoundation.org/api/resources/Magma/${VANILLA_VERSION}/stable/latest/download; then
+  log "ERROR unable to download version ${VANILLA_VERSION} of Magma"
+  log "      Check https://magmafoundation.org/ for available versions"
   exit 1
 fi
 
-tagName=$(echo "${latestMeta}" | jq -r '.tag_name')
-markerFile=".magma-installed-${VANILLA_VERSION}-${tagName}"
-if [ -f "${markerFile}" ]; then
-  installedTagName=$(cat "${markerFile}")
-fi
-
-if [ ! -f "${markerFile}" ]; then
-
-  if versionLessThan 1.16; then
-    assetType=server
-  else
-    assetType=installer
-  fi
-
-  assetUrl=$(echo "${latestMeta}" | jq -r ".assets | .[].browser_download_url | select(test(\"${assetType}\"))")
-  if [ $? != 0 ] || [ -z "$assetUrl" ]; then
-    log "ERROR failed to extract ${assetType} asset type for ${VANILLA_VERSION} in channel ${MAGMA_CHANNEL}"
-    exit 1
-  fi
-
-  if [[ ${assetType} = server ]]; then
-    magmaDownloadServer "$assetUrl" "$tagName" "$markerFile"
-  else
-    magmaHandleInstaller "$assetUrl" "$tagName" "$markerFile"
-  fi
-else
-  export SERVER=$(cat "${markerFile}")
-
-  if [[ $SERVER == "forge" ]]; then
-    export FORGE_INSTALLER="magma-installer-${VANILLA_VERSION}-${tagName}.jar"
-    export FORGE_INSTALLER_CUSTOM_VERSION="$tagName"
-    # now hand off the rest to forge
-    exec ${SCRIPTS:-/}start-deployForge "$@"
-  fi
-fi
+export SKIP_LOG4J_CONFIG=true
 
 # Continue to Final Setup
 exec ${SCRIPTS:-/}start-finalSetupWorld $@

start-minecraftFinalSetup

@@ -173,10 +173,6 @@ function copyFilesForCurseForge() {
 }
 
 mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
-if [[ ${STOP_SERVER_ANNOUNCE_DELAY} ]]; then
-  mcServerRunnerArgs="${mcServerRunnerArgs} --stop-server-announce-delay ${STOP_SERVER_ANNOUNCE_DELAY}s"
-fi
-
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
     if isTrue ${DEBUG_EXEC}; then
       set -x
@@ -229,10 +225,6 @@ EOF
   else
     exec mc-server-runner ${mcServerRunnerArgs} "${finalArgs[@]}"
   fi
-elif [[ -x run.sh ]]; then
-  log "Using Forge supplied run.sh script..."
-  echo $JVM_XX_OPTS $JVM_OPTS $expandedDOpts > user_jvm_args.txt
-  exec mc-server-runner ${mcServerRunnerArgs} --shell bash run.sh
 else
   # If we have a bootstrap.txt file... feed that in to the server stdin
   if [ -f /data/bootstrap.txt ]; then

start-spiget

@@ -6,7 +6,6 @@ IFS=$'\n\t'
 handleDebugMode
 
 : ${SPIGET_RESOURCES:=}
-: ${SPIGET_DOWNLOAD_TOLERANCE:=5} # in minutes
 
 containsJars() {
   file=${1?}
@@ -29,61 +28,26 @@ getResourceFromSpiget() {
 
   mkdir -p /data/plugins
 
-  versionfile="/data/plugins/.${resource}-version.json"
-  versionfileNew="/tmp/.${resource}-version.json"
+  if [ -f /data/plugins/.${resource} ]; then
+    log "Resource '${resource}' already downloaded"
+  else
+    tmpfile="/tmp/${resource}.zip"
+    url="https://api.spiget.org/v2/resources/${resource}/download"
+    if ! curl -o "${tmpfile}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${url}"; then
+      log "ERROR failed to download resource '${resource}' from ${url}"
+      exit 2
+    fi
 
-  if [ -f "$versionfile" ]; then
-    if [[ -n $(find "$versionfile" -mmin +${SPIGET_DOWNLOAD_TOLERANCE}) ]]; then
-      urlVersion="https://api.spiget.org/v2/resources/${resource}/versions/latest"
-      if ! curl -o "${versionfileNew}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${urlVersion}"; then
-        log "ERROR failed to download resource version meta data '${resource}' from ${urlVersion}"
-        exit 2
-      fi
-
-      installedVersion=$(jq -r '.name' $versionfile)
-      newVersion=$(jq -r '.name' $versionfileNew)
-      
-      if [ "$installedVersion" = "$newVersion" ]; then
-        log "resource '${resource}' not downloaded because installed version '${installedVersion}' already up to date ('${newVersion}')"
-        mv "${versionfileNew}" "${versionfile}"
-      else
-        if downloadResourceFromSpiget "${resource}"; then
-          mv "${versionfileNew}" "${versionfile}"
-        fi
-      fi
+    if containsJars "${tmpfile}"; then
+      log "Extracting contents of resource ${resource} into plugins"
+      unzip -o -q -d /data/plugins "${tmpfile}"
+      touch "/data/plugins/.${resource}"
+      rm "${tmpfile}"
     else
-      log "resource '${resource}' not checked because version meta file newer than '${SPIGET_DOWNLOAD_TOLERANCE}' minutes"
+      log "Moving resource ${resource} into plugins"
+      mv "${tmpfile}" "/data/plugins/${resource}.jar"
+      touch "/data/plugins/.${resource}"
     fi
-  else
-    if downloadResourceFromSpiget "${resource}"; then
-      urlVersion="https://api.spiget.org/v2/resources/${resource}/versions/latest"
-      if ! curl -o "${versionfileNew}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${urlVersion}"; then
-        log "ERROR failed to download resource version meta data '${resource}' from ${urlVersion}"
-        exit 2
-      fi
-      mv "${versionfileNew}" "${versionfile}"
-    fi
-  fi
-
-}
-
-downloadResourceFromSpiget() {
-  resource=${1?}
-
-  tmpfile="/tmp/${resource}.zip"
-  url="https://api.spiget.org/v2/resources/${resource}/download"
-  if ! curl -o "${tmpfile}" -fsSL -H "User-Agent: itzg/minecraft-server" "${extraCurlArgs[@]}" "${url}"; then
-    log "ERROR failed to download resource '${resource}' from ${url}"
-    exit 2
-  fi
-
-  if containsJars "${tmpfile}"; then
-    log "Extracting contents of resource ${resource} into plugins"
-    unzip -o -q -d /data/plugins "${tmpfile}"
-    rm "${tmpfile}"
-  else
-    log "Moving resource ${resource} into plugins"
-    mv "${tmpfile}" "/data/plugins/${resource}.jar"
   fi
 
 }

tests/docker-compose.test.yml

@@ -17,4 +17,5 @@ services:
       - itzg/minecraft-server:latest
     environment:
       EULA: "TRUE"
+      VERSION: "1.16.5"