docs: Updated description of LEVEL_TYPE (#1575)

* Added support for Pufferfish 1.19

* Update scripts/start-deployPufferfish

Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>

* Removed wrong negation

Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>

.github/workflows/build-multiarch.yml

@@ -34,19 +34,19 @@ jobs:
             # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343
             baseImage: eclipse-temurin:17-jre-focal
             platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: LATEST
+            mcVersion: 1.18.2
           - variant: java17-jdk
             baseImage: eclipse-temurin:17-focal
             platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: LATEST
+            mcVersion: 1.18.2
           - variant: java17-openj9
             baseImage: ibm-semeru-runtimes:open-17-jre
             platforms: linux/amd64,linux/arm64
-            mcVersion: LATEST
+            mcVersion: 1.18.2
           - variant: java17-alpine
             baseImage: eclipse-temurin:17-jre-alpine
             platforms: linux/amd64
-            mcVersion: LATEST
+            mcVersion: 1.18.2
         # JAVA 11:
           - variant: java11
             baseImage: adoptopenjdk:11-jre-hotspot

.github/workflows/pr.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Run tests
         env:
           MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
-          MINECRAFT_VERSION: LATEST
+          MINECRAFT_VERSION: 1.18.2
         run: |
           tests/test.sh
   push:

README.md

@@ -86,9 +86,14 @@ Everything the container manages is located under the **container's** `/data` pa
 
 ### Attaching data directory to host filesystem
 
-In most cases the easier way to persist and work with the minecraft data files is to use the `-v` argument to map a directory on your host machine to the container's `/data` directory, such as the following where `/home/user/minecraft-data` would be a directory of your choosing on your host machine:
+In most cases the easiest way to persist and work with the minecraft data files is to use the [volume mounting](https://docs.docker.com/storage/volumes/) `-v` argument to map a directory on your host machine to the container's `/data` directory. In the following example, the path `/home/user/minecraft-data` **must be** a directory on your host machine:
 
-    docker run -d -v /home/user/minecraft-data:/data ...
+    -v /home/user/minecraft-data:/data
+       ------------------------- -----
+        |                         |
+        |                         +-- must always be /data
+        |
+        +-- replace with a directory on your host machine
 
 When attached in this way you can stop the server, edit the configuration under your attached directory and start the server again to pick up the new configuration.
 
@@ -222,6 +227,10 @@ A tool that is bundled with this image that provides health checks and metrics r
 
 A tool that is bundled with this image to provide complex, re-usable preparation operations. 
 
+### [itzg/rcon](https://github.com/itzg/docker-rcon-web-admin)
+
+An image that dockerizes [rcon-web-admin](https://github.com/rcon-web-admin/rcon-web-admin).
+
 ## Healthcheck
 
 This image contains [mc-monitor](https://github.com/itzg/mc-monitor) and uses
@@ -451,6 +460,7 @@ Extra variables:
 - `PURPUR_BUILD=LATEST` : set a specific Purpur build to use
 - `FORCE_REDOWNLOAD=false` : set to true to force the located server jar to be re-downloaded
 - `USE_FLARE_FLAGS=false` : set to true to add appropriate flags for the built-in [Flare](https://blog.airplane.gg/flare) profiler
+- `PURPUR_DOWNLOAD_URL=<url>` : set URL to download Purpur from custom URL.
 
 ### Running a Magma server
 
@@ -1169,30 +1179,9 @@ environment variable set to `false`, such as
 ### Level Type and Generator Settings
 
 By default, a standard world is generated with hills, valleys, water, etc. A different level type can
-be configured by setting `LEVEL_TYPE` to an expected type, for example
+be configured by setting `LEVEL_TYPE` to [an expected type listed here](https://minecraft.fandom.com/wiki/Server.properties#level-type).
 
-- DEFAULT
-- FLAT
-- LARGEBIOMES
-- AMPLIFIED
-- CUSTOMIZED
-- BUFFET
-- BIOMESOP (Biomes O' Plenty for 1.12 and older)
-- BIOMESOPLENTY (Biomes O' Plenty for 1.15 and above)
-
-Descriptions are available at the [gamepedia](http://minecraft.gamepedia.com/Server.properties).
-
-When using a level type of `FLAT`, `CUSTOMIZED`, and `BUFFET`, you can further configure the world generator
-by passing [custom generator settings](http://minecraft.gamepedia.com/Superflat).
-**Since generator settings usually have ;'s in them, surround the -e value with a single quote, like below.**
-
-For example (just the `-e` bits):
-
-    -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS=3;minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;2;'
-
-In Minecraft 1.13+ you need to pass json ([generator site](https://misode.github.io/world/)) like this (details see [here](https://github.com/itzg/docker-minecraft-server/issues/999#issuecomment-907849644)):
-
-    -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS={"biome":"minecraft:the_void","layers":[{"block":"minecraft:bedrock","height":1},{"block":"minecraft:stone","height":10},{"block":"minecraft:dirt","height":1}],"structures":{"structures":{}}}'
+For some of the level types, `GENERATOR_SETTINGS` can be used to further customize the world generation [as described here](https://minecraft.fandom.com/wiki/Server.properties#generator-settings).
 
 ### Custom Server Resource Pack
 
@@ -1560,6 +1549,14 @@ To enable the JVM flags required to fully support the [Flare profiling suite](ht
     
 Flare is built-in to Airplane/Pufferfish/Purpur, and is available in [plugin form](https://github.com/TECHNOVE/FlarePlugin) for other server types.
 
+### Enable support for optimized SIMD operations
+
+To enable support for optimized SIMD operations, the JVM flag can be set with the following variable:
+
+    -e USE_SIMD_FLAGS=true
+
+SIMD optimized operations are supported by Pufferfish and Purpur.
+
 ### Enable timestamps in init logs
 
 Before the container starts the Minecraft Server its output is prefixed with `[init]`, such as

examples/docker-compose-generic-pack-atm7.yml

@@ -0,0 +1,19 @@
+version: '3.8'
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    volumes:
+    - ./data:/data
+    - ./modpacks:/modpacks:ro
+    environment:
+      EULA: "true"
+      MEMORY: 2G
+      TYPE: FORGE
+      VERSION: 1.18.2
+      FORGEVERSION: 40.1.30
+      # Need to download Server-Files-0.4.13.zip and
+      # put it in modpacks directory next to this compose file
+      GENERIC_PACK: /modpacks/Server-Files-0.4.13.zip
+    ports:
+      - "25565:25565"

scripts/start-deployPaper

@@ -4,6 +4,30 @@
 set -o pipefail
 isDebugging && set -x
 
+ourScript="$0"
+ourArgs=("$@")
+
+function handleMissingVersion() {
+  expectedVersion=${VANILLA_VERSION}
+  versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
+  if [[ $VERSION = LATEST ]]; then
+    tries=0
+    while ((tries++ < 5)); do
+      VANILLA_VERSION=$(echo "$versions" | jq -r ".versions[$((- tries))]")
+      if [[ $(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
+               | jq '.builds[-1]') != null ]]; then
+        log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
+        # re-execute the current script with the newly computed version
+        exec "$ourScript" "${ourArgs[@]}"
+     fi
+   done
+  fi
+  log "ERROR: ${expectedVersion} is not published by PaperMC"
+  log "       Set VERSION to one of the following: "
+  log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
+  exit 1
+}
+
 if [[ $PAPER_DOWNLOAD_URL ]]; then
   export SERVER=$(getFilenameFromUrl "${PAPER_DOWNLOAD_URL}")
 
@@ -23,26 +47,16 @@ else
     0)
       ;;
     22)
-      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
+      handleMissingVersion
       ;;
     *)
       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
+
+  if [[ $build = null ]]; then
+    handleMissingVersion
   fi
 
   export SERVER=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}" -H  "accept: application/json" \

scripts/start-deployPufferfish

@@ -8,8 +8,8 @@ isDebugging && set -x
 
 IFS=$'\n\t'
 
-if [[ "${MAJOR_VANILLA_VERSION}" != "1.18" ]] && [[ "${MAJOR_VANILLA_VERSION}" != "1.17" ]]; then
-  log "ERROR: Pufferfish server type only supports versions 1.18 or 1.17, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc"
+if versionLessThan 1.17; then
+  log "ERROR: Pufferfish server type only supports versions 1.17, 1.18 or 1.19, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc"
   exit 1
 fi
 

scripts/start-deployPurpur

@@ -2,37 +2,51 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+: "${PURPUR_DOWNLOAD_URL:=}"
+
 # shellcheck source=start-utils
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x
 
-: "${VANILLA_VERSION:?}"
-: "${PURPUR_BUILD:=LATEST}"
-: "${FORCE_REDOWNLOAD:=false}"
+if [[ $PURPUR_DOWNLOAD_URL ]]; then
+  export SERVER=$(getFilenameFromUrl "${PURPUR_DOWNLOAD_URL}")
 
-if [[ ${PURPUR_BUILD} == LATEST ]]; then
-  if ! PURPUR_BUILD=$(get --json-path=".builds.latest" "https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}"); then
-    log "ERROR: Failed to locate a Purpur build for ${VANILLA_VERSION}."
-    log "       Please check if a download is available at https://purpur.pl3x.net/downloads/"
-    exit 1
+  if [ -f "$SERVER" ]; then
+    zarg=(-z "$SERVER")
   fi
-fi
 
-export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"
+  echo "Preparing custom Purpur jar from $PURPUR_DOWNLOAD_URL"
 
-log "Removing old Purpur versions ..."
-shopt -s nullglob
-for f in purpur-*.jar; do
-  [[ $f != "$SERVER" ]] && rm "$f"
-done
+  curl -fsSL -o "$SERVER" "${zarg[@]}" "${PURPUR_DOWNLOAD_URL}"
+else
+  : "${VANILLA_VERSION:?}"
+  : "${PURPUR_BUILD:=LATEST}"
+  : "${FORCE_REDOWNLOAD:=false}"
 
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
-    log "Downloading Purpur from $downloadUrl ..."
-    if ! get -o "$SERVER" "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
+  if [[ ${PURPUR_BUILD} == LATEST ]]; then
+    if ! PURPUR_BUILD=$(get --json-path=".builds.latest" "https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}"); then
+      log "ERROR: Failed to locate a Purpur build for ${VANILLA_VERSION}."
+      log "       Please check if a download is available at https://purpur.pl3x.net/downloads/"
+      exit 1
     fi
+  fi
+
+  export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"
+
+  log "Removing old Purpur versions ..."
+  shopt -s nullglob
+  for f in purpur-*.jar; do
+    [[ $f != "$SERVER" ]] && rm "$f"
+  done
+
+  if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
+      downloadUrl="https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
+      log "Downloading Purpur from $downloadUrl ..."
+      if ! get -o "$SERVER" "$downloadUrl"; then
+        log "ERROR: failed to download from $downloadUrl (status=$?)"
+        exit 3
+      fi
+  fi
 fi
 
 # Normalize on Spigot for later operations

scripts/start-finalExec

@@ -186,6 +186,12 @@ if isTrue "${USE_FLARE_FLAGS}"; then
   "
 fi
 
+if isTrue "${USE_SIMD_FLAGS}"; then
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  --add-modules=jdk.incubator.vector
+  "
+fi
+
 if isTrue "${DEBUG_MEMORY}"; then
   log "Memory usage and availability (in MB)"
   uname -a

scripts/start-setupForgeApiMods

@@ -118,7 +118,7 @@ modFileByProjectID(){
       # Looks for file by name
       current_project_file=$(jq -n "$project_files" | jq --arg FILE_NAME "$project_id_file_name" -jc '
         .data | map(select(.fileName<=($FILE_NAME))) | .[0] // empty')
-    elif $( ! isTrue "$MODS_FORGEAPI_IGNORE_GAMETYPE" ) && $FILTER_BY_FAMILY ; then
+    elif isFalse "${MODS_FORGEAPI_IGNORE_GAMETYPE}" && $FILTER_BY_FAMILY ; then
       # Looks for file by version and server type in lowercase
       current_project_file=$(jq -n "$project_files" | jq --arg RELEASE_FILTER "$RELEASE_NUMBER_FILTER" --arg GAME_TYPE "${FAMILY,,}" --arg VERSION "$VANILLA_VERSION" -jc '
         .data | sort_by(.id) | reverse | map(select(.gameVersions[] | ascii_downcase | contains ($GAME_TYPE))) |  map(select(.gameVersions[] | contains ($VERSION))) | map(select(.releaseType<=($RELEASE_FILTER|tonumber))) | .[0] // empty')
@@ -160,7 +160,7 @@ downloadModPackfromModFile() {
   fi
   # trys to make the output directory incase it doesnt exist.
   mkdir -p "$out_dir"
-
+  debug "DEBUG: PROJECT_FILE: ${PROJECT_FILE}"
   # grabs needed values from our json return
   file_name=$(jq -n "$PROJECT_FILE" | jq -jc '.fileName // empty' )
   download_url=$(jq -n "$PROJECT_FILE" | jq -jc '.downloadUrl // empty' )
@@ -204,9 +204,10 @@ if [ "$MODS_FORGEAPI_FILE" ] && [ -z "$MODS_FORGEAPI_PROJECTIDS" ]; then
     log "ERROR: given MODS_FORGEAPI_FILE file does not exist"
     exit 2
   fi
-
+  debug "DEBUG: MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_FILE}"
   # Needs loop here to look up release types befor calling download.
   while read -r current_project; do
+    debug "DEBUG: current_project: ${current_project}"
     # Per stack overflow we can use //empty to return empty string that works with -z
     project_id=$(jq -n "$current_project" | jq -r '.projectId // empty' )
     current_release_type=$(jq -n "$current_project" | jq -r '.releaseType // empty' )

scripts/start-setupModpack

@@ -39,12 +39,22 @@ if [[ "${PACKWIZ_URL}" ]]; then
       ln -sf "${PACKWIZ_JAR}" packwiz-installer-bootstrap.jar
     fi
   fi
-  if [[ ! -e packwiz-installer-bootstrap.jar ]]; then
+  if [[ ! -f packwiz-installer-bootstrap.jar ]]; then
     log "ERROR: Packwiz not available or could not be downloaded from Github!"
     exit 1
   fi
   log "Running packwiz against URL: ${PACKWIZ_URL}"
   java -jar packwiz-installer-bootstrap.jar -g -s server "${PACKWIZ_URL}"
+  #if bootstrap download fails, download installer manually - then run without updating
+  returnVal=$?
+  if [[ $returnVal ]]; then
+    latestPackwizInstaller=$(curl -fsSL https://api.github.com/repos/packwiz/packwiz-installer/releases/latest)
+    latestPackwizInstallerVer=$(echo ${latestPackwizInstaller} | jq --raw-output '.tag_name')
+    latestPackwizInstallerUrl=$(echo ${latestPackwizInstaller} | jq --raw-output '.assets[] | select(.name | match("packwiz-installer.jar")) | .url')
+    log "Packwiz couldn't update - Downloading Packwiz Installer ${latestPackwizInstallerVer}"
+    curl -H "Accept:application/octet-stream" -o "packwiz-installer.jar" -fsSL ${latestPackwizInstallerUrl}
+    java -jar packwiz-installer-bootstrap.jar -g -bootstrap-no-update -s server "${PACKWIZ_URL}"
+  fi
 fi
 
 # If supplied with a URL for a modpack (simple zip of jars), download it and unpack

scripts/start-setupServerProperties

@@ -116,6 +116,8 @@ function customizeServerProps {
   setServerProp "prevent-proxy-connections" PREVENT_PROXY_CONNECTIONS
   setServerProp "use-native-transport" USE_NATIVE_TRANSPORT
   setServerProp "simulation-distance" SIMULATION_DISTANCE
+  setServerProp "previews-chat" PREVIEWS_CHAT
+  setServerProp "enforce-secure-profile" ENFORCE_SECURE_PROFILE
   setServerPropValue "motd" "$(echo "$MOTD" | mc-image-helper asciify)"
   [[ $LEVEL_TYPE ]] && setServerPropValue "level-type" "${LEVEL_TYPE^^}"
 

scripts/start-utils

@@ -66,6 +66,28 @@ function isTrue() {
   return ${result}
 }
 
+function isFalse() {
+  local oldState
+  oldState=$(shopt -po xtrace)
+  shopt -u -o xtrace
+
+  local value=${1,,}
+
+  result=
+
+  case ${value} in
+  false | off)
+    result=0
+    ;;
+  *)
+    result=1
+    ;;
+  esac
+
+  eval "$oldState"
+  return ${result}
+}
+
 function isDebugging() {
   if isTrue "${DEBUG:-false}"; then
     return 0

tests/setuponlytests/forgeapimods_file/docker-compose.yml

@@ -7,12 +7,13 @@ services:
     environment:
       EULA: "TRUE"
       SETUP_ONLY: "TRUE"
+      DEBUG: "FALSE"
       # Using custom to bypass Fabric setup
       TYPE: CUSTOM
       # Using family to test FORGEAPI Family filter.
       FAMILY: FABRIC
       CUSTOM_SERVER: /servers/fake.jar
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VERSION: 1.18.2
       MODS_FORGEAPI_FILE: /config/forgeapi_mods.json
       # Key is defined in .github/workflows/pr.yml and ci.yml
       # This should be coming from github secrets.

tests/setuponlytests/forgeapimods_file/forgeapi_mods.json

@@ -1,11 +1,11 @@
-[{
-        "name": "On A Stick [FABRIC]",
-        "projectId": "550544",
-        "releaseType": "release"
-    },
-    {
-        "name": "Fabric Voice Mod",
-        "projectId": "416089",
-        "releaseType": "beta"
-    }
+[
+  {
+    "name": "Flan (Land Claim Tool)",
+    "projectId": "404578"
+  },
+  {
+    "name": "Fabric Voice Mod",
+    "projectId": "416089",
+    "releaseType": "beta"
+  }
 ]

tests/setuponlytests/forgeapimods_file/verify.sh

@@ -1,5 +1,5 @@
 # Validates specific beta call out for specific mod:
 mc-image-helper assert fileExists "/data/mods/voicechat-fabric*"
-mc-image-helper assert fileExists "/data/mods/onastick-fabric*"
-# Dependent of on a stick:
+mc-image-helper assert fileExists "/data/mods/flan*"
+# Dependent of flan:
 mc-image-helper assert fileExists "/data/mods/fabric-api*"

tests/setuponlytests/forgeapimods_gametype/docker-compose.yml

@@ -7,23 +7,24 @@ services:
     environment:
       EULA: "TRUE"
       SETUP_ONLY: "TRUE"
+      DEBUG: "FALSE"
       # Using custom to bypass Fabric setup
       TYPE: CUSTOM
       # Using family to test FORGEAPI Family filter.
       FAMILY: FABRIC
       CUSTOM_SERVER: /servers/fake.jar
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VERSION: 1.18.2
       # Validate Skip Gametype Filter:
       MODS_FORGEAPI_IGNORE_GAMETYPE: "TRUE"
       # Validates that Biomes does not download terrablender
       # Using default false for testing: 
-      # MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "FALSE"
+      MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "FALSE"
       # Contains mix of Forge and Fabric mods
-      MODS_FORGEAPI_PROJECTIDS: 306612,416089,220318
+      MODS_FORGEAPI_PROJECTIDS: 416089,493246
       # Allows for Beta releases of 416089 the Fabric Voice Mod 
       MODS_FORGEAPI_RELEASES: BETA
       MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
-      REMOVE_OLD_FORGEAPI_MODS: "FALSE"
+      REMOVE_OLD_FORGEAPI_MODS: "TRUE"
     volumes:
       - ./data:/data
       - ./fake.jar:/servers/fake.jar

tests/setuponlytests/forgeapimods_gametype/verify.sh

@@ -1,5 +1,5 @@
-mc-image-helper assert fileExists "/data/mods/BiomesOPlenty*"
 # testing dependencies don't get downloaded when download dependencies is set to false.
-! mc-image-helper assert fileExists "/data/mods/TerraBlender*"
 mc-image-helper assert fileExists "/data/mods/voicechat-fabric*"
-mc-image-helper assert fileExists "/data/mods/fabric-api*"
+mc-image-helper assert fileExists "/data/mods/flan*"
+# Dependent of flan, but dependencies are set to false:
+! mc-image-helper assert fileExists "/data/mods/fabric-api*"

tests/setuponlytests/forgeapimods_projectids/docker-compose.yml

@@ -13,7 +13,7 @@ services:
       #  - Currently we do not support filtering on vanilla.
       FAMILY: VANILLA
       CUSTOM_SERVER: /servers/fake.jar
-      VERSION: ${MINECRAFT_VERSION:-LATEST}
+      VERSION: 1.18.2
       MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "TRUE"
       # Contains mix of Forge and Fabric mods
       MODS_FORGEAPI_PROJECTIDS: 416089,419697

tests/setuponlytests/test.sh

@@ -15,6 +15,13 @@ $logs
 "
 }
 
+delta() {
+  startTime=${1?}
+
+  endTime=$(date +%s)
+  echo "$(( endTime - startTime )) seconds"
+}
+
 # tests that only run the setup files for things like downloads and configuration.
 setupOnlyMinecraftTest(){
   folder=$1
@@ -32,19 +39,22 @@ setupOnlyMinecraftTest(){
     fi
   fi
 
+  start=$(date +%s)
   if ! logs=$(docker-compose run mc 2>&1); then
     outputContainerLog "$logs"
     result=1
   elif [ -f verify.sh ]; then
     if ! docker run --rm --entrypoint bash -v "${PWD}/data":/data -v "${PWD}/verify.sh":/verify "${IMAGE_TO_TEST:-itzg/minecraft-server}" -e /verify; then
-      echo "Verify ${folder} FAILED"
+      endTime=$(date +%s)
+      echo "${folder} FAILED verify in $(delta start)"
       outputContainerLog "$logs"
       result=1
     else
-      echo "Verify ${folder} PASS"
+      endTime=$(date +%s)
+      echo "${folder} PASSED verify in $(delta start)"
     fi
   else
-    echo "${folder} PASS"
+    echo "${folder} PASSED in $(delta start)"
   fi
 
   docker-compose down -v --remove-orphans > /dev/null