Auto-merging via docker-versions-create

docs: Auto update markdown TOC
Added support for STOP_SERVER_ANNOUNCE_DELAY
2026-02-17 23:16:24 +00:00 · 2021-08-01 12:14:17 -05:00 · 2021-08-01 17:09:37 +00:00 · 2021-08-01 12:09:18 -05:00 · 2021-07-31 09:28:40 -05:00 · 2021-07-31 14:24:59 +00:00
25 changed files with 576 additions and 380 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -2,16 +2,20 @@ name: Build and publish multiarch
 on:
  push:
    branches:
-      - multiarch
-      - multiarch-latest
-      - java15
-      - java16
+      - master
+      - "*-multiarch"
+      - "multiarch*"
+      - java8-openj9
+      - java11*
+      - java16*
      - test/multiarch/*
    tags:
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
-      - "[0-9]+.[0-9]+.[0-9]+-java15"
-      - "[0-9]+.[0-9]+.[0-9]+-java16"
+      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch*"
+      - "[0-9]+.[0-9]+.[0-9]+-*multiarch"
+      - "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
+      - "[0-9]+.[0-9]+.[0-9]+-java11*"
+      - "[0-9]+.[0-9]+.[0-9]+-java16*"
    paths-ignore:
      - "*.md"
      - "docs/**"
@@ -19,6 +23,7 @@ on:

 jobs:
  docker-buildx:
+    if: github.repository == 'itzg/docker-minecraft-server'
    runs-on: ubuntu-20.04
    steps:
      - name: Checkout
@@ -33,20 +38,22 @@ jobs:
          tags: |
            type=ref,event=branch
            type=ref,event=tag
+          flavor: |
+            latest=${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}

      - name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v1

      - name: Cache Docker layers
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
        with:
          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}-${{ github.sha }}
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
          restore-keys: |
-            ${{ runner.os }}-buildx-${{ steps.meta.outputs.version }}-
+            ${{ runner.os }}-buildx-

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1.1.0
+        uses: docker/setup-qemu-action@v1.2.0

      - name: Login to DockerHub
        uses: docker/login-action@v1
@@ -56,17 +63,25 @@ jobs:

      - name: Build and push
        id: docker_build
-        uses: docker/build-push-action@v2.4.0
+        uses: docker/build-push-action@v2.6.1
        with:
          context: .
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          platforms: linux/amd64
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          # ensure latest base image is used
          pull: true
          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
          labels: ${{ steps.meta.outputs.labels }}

      - name: Image digest
        run: echo ${{ steps.docker_build.outputs.digest }}
+
+      - # Temp fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
--- a/.github/workflows/generate-toc.yml
+++ b/.github/workflows/generate-toc.yml
@@ -7,6 +7,7 @@ on:
      - README.md
 jobs:
  generate:
+    if: github.repository == 'itzg/docker-minecraft-server'
    runs-on: ubuntu-latest
    timeout-minutes: 5
    steps:
@@ -17,4 +18,4 @@ jobs:
          ./gh-md-toc --insert --no-backup README.md
      - uses: stefanzweifel/git-auto-commit-action@v4.11.0
        with:
-          commit_message: Auto update markdown TOC
+          commit_message: "docs: Auto update markdown TOC"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,14 +3,12 @@ name: Build and Publish
 on:
  push:
    branches:
-      - master
      - java8
      - openj9
      - openj9-11
      - adopt11
      - test/*
    tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
      - "[0-9]+.[0-9]+.[0-9]+-java8"
      - "[0-9]+.[0-9]+.[0-9]+-openj9"
      - "[0-9]+.[0-9]+.[0-9]+-openj9-11"
@@ -51,20 +49,17 @@ jobs:
        fi
        TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
        echo ::set-output name=tags::${TAGS}
-        echo ::set-output name=cache_from::${TAGS}
        echo ::set-output name=version::${VERSION//\//-}
-        echo ::set-output name=cache_version::${VERSION//\//-}

    - name: Setup Docker Buildx
      uses: docker/setup-buildx-action@v1

    - name: Cache Docker layers
-      uses: actions/cache@v2.1.5
+      uses: actions/cache@v2.1.6
      with:
        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
        restore-keys: |
-          ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
          ${{ runner.os }}-buildx-

    - name: Login to DockerHub
@@ -75,7 +70,7 @@ jobs:

    - name: Build and push
      id: docker_build
-      uses: docker/build-push-action@v2.4.0
+      uses: docker/build-push-action@v2.6.1
      with:
        context: .
        file: ./Dockerfile
@@ -86,7 +81,7 @@ jobs:
        # tags determined by prep step
        tags: ${{ steps.prep.outputs.tags }}
        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new
        labels: |
          org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
          org.opencontainers.image.version=${{ steps.prep.outputs.version }}
@@ -95,3 +90,11 @@ jobs:

    - name: Image digest
      run: echo ${{ steps.docker_build.outputs.digest }}
+
+    - # Temp fix
+      # https://github.com/docker/build-push-action/issues/252
+      # https://github.com/moby/buildkit/issues/1896
+      name: Move cache
+      run: |
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
--- a/5
+++ b/5
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jre
+FROM adoptopenjdk:11-jre-openj9

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

@@ -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.5.0 --var app=mc-server-runner --file {{.app}} \
+ --var version=1.6.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} \
@@ -84,5 +84,6 @@ 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
--- a/README.md
+++ b/README.md
@@ -13,30 +13,11 @@ To simply use the latest stable version, run

    docker run -d -it -p 25565:25565 -e EULA=TRUE itzg/minecraft-server

-where the standard server port, 25565, will be exposed on your host machine.
+where, in this case, the standard server port 25565, will be exposed on your host machine.

-If you want to serve up multiple Minecraft servers or just use an alternate port,
-change the host-side port mapping such as
+> 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.

-    ... -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.
+> Be sure to always include `-e EULA=TRUE` in your commands and container definitions, 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. 

@@ -56,6 +37,7 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [Helm Charts](#helm-charts)
      * [Examples](#examples)
      * [Amazon Web Services (AWS) Deployment](#amazon-web-services-aws-deployment)
+      * [Using Docker Compose](#using-docker-compose)
   * [Server types](#server-types)
      * [Running a Forge Server](#running-a-forge-server)
      * [Running a Bukkit/Spigot server](#running-a-bukkitspigot-server)
@@ -75,15 +57,18 @@ 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)
-   * [Optional plugins, mods, and config attach points](#optional-plugins-mods-and-config-attach-points)
-   * [Auto-downloading SpigotMC/Bukkit/PaperMC plugins](#auto-downloading-spigotmcbukkitpapermc-plugins)
-   * [Replacing variables inside configs](#replacing-variables-inside-configs)
-   * [Running with a custom server JAR](#running-with-a-custom-server-jar)
-   * [Force re-download of the server file](#force-re-download-of-the-server-file)
-   * [Using Docker Compose](#using-docker-compose)
+   * [Working with mods and plugins](#working-with-mods-and-plugins)
+      * [Optional plugins, mods, and config attach points](#optional-plugins-mods-and-config-attach-points)
+      * [Auto-downloading SpigotMC/Bukkit/PaperMC plugins](#auto-downloading-spigotmcbukkitpapermc-plugins)
+      * [Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers](#downloadable-modplugin-pack-for-forge-bukkit-and-spigot-servers)
+      * [Remove old mods/plugins](#remove-old-modsplugins)
+   * [Working with world data](#working-with-world-data)
+      * [Downloadable world](#downloadable-world)
+      * [Cloning world from a container path](#cloning-world-from-a-container-path)
+      * [Overwrite world on start](#overwrite-world-on-start)
   * [Server configuration](#server-configuration)
      * [Server name](#server-name)
      * [Server port](#server-port)
@@ -115,20 +100,19 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [PVP Mode](#pvp-mode)
      * [Level Type and Generator Settings](#level-type-and-generator-settings)
      * [Custom Server Resource Pack](#custom-server-resource-pack)
-      * [World Save Name](#world-save-name)
-      * [Downloadable world](#downloadable-world)
-      * [Cloning world from a container path](#cloning-world-from-a-container-path)
-      * [Overwrite world on start](#overwrite-world-on-start)
-      * [Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers](#downloadable-modplugin-pack-for-forge-bukkit-and-spigot-servers)
-      * [Remove old mods/plugins](#remove-old-modsplugins)
+      * [Level / World Save Name](#level--world-save-name)
      * [Online mode](#online-mode)
      * [Allow flight](#allow-flight)
      * [Other server property mappings](#other-server-property-mappings)
   * [Miscellaneous Options](#miscellaneous-options)
+      * [Replacing variables inside configs](#replacing-variables-inside-configs)
+      * [Running with a custom server JAR](#running-with-a-custom-server-jar)
+      * [Force re-download of the server file](#force-re-download-of-the-server-file)
      * [Running as alternate user/group ID](#running-as-alternate-usergroup-id)
      * [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)
@@ -143,7 +127,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: Thu May 20 01:17:11 UTC 2021 -->
+<!-- Added by: runner, at: Sun Aug  1 17:09:36 UTC 2021 -->

 <!--te-->

@@ -210,7 +194,7 @@ When attached in this way you can stop the server, edit the configuration under
 With Docker Compose, setting up a host attached directory is even easier since relative paths can be configured. For example, with the following `docker-compose.yml` Docker will automatically create/attach the relative directory `minecraft-data` to the container.

 ```yaml
-version: "3.8"
+version: "3"

 services:
  mc:
@@ -219,6 +203,9 @@ services:
      - 25565:25565
    environment:
      EULA: "TRUE"
+    tty: true
+    stdin_open: true
+    restart: unless-stopped
    volumes:
      # attach a directory relative to the directory containing this compose file
      - ./minecraft-data:/data
@@ -247,7 +234,7 @@ docker run -d -it --name mc-new -v mc:/data -p 25565:25565 -e EULA=TRUE -e MEMOR

 ## Versions

-To use a different Minecraft version, pass the `VERSION` environment variable, which can have the value
+To use a different Minecraft version, pass the `VERSION` environment variable (case sensitive), which can have the value

 - LATEST (the default)
 - SNAPSHOT
@@ -268,22 +255,18 @@ the server jar remain in the `/data` directory. It is safe to remove those._

 ## Running Minecraft server on different Java version

-> **NOTE** [as of snapshot 21W19A](https://www.minecraft.net/en-us/article/minecraft-snapshot-21w19a), Java 16 is now required. Please use `itzg/minecraft-server:java16` for that version and newer. Consideration of changing the `latest` will be made after 1.17 releases.
-
 To use a different version of Java, please use a docker tag to run your Minecraft server.

 | Tag name       | Java version | Linux  | JVM Type | Architecture      |
 | -------------- | -------------|--------|----------|-------------------|
-| latest         | 11           | Alpine | Hotspot  | amd64             |
+| latest         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8          | 8            | Alpine | Hotspot  | amd64             |
 | java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
-| java15         | 15           | Debian | Hotspot  | amd64,arm64,armv7 |
-| java15-openj9  | 15           | Debian | OpenJ9   | amd64,arm64       |
+| java8-openj9   | 8            | Debian | OpenJ9   | amd64             |
+| java11         | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
+| java11-openj9  | 11           | Debian | OpenJ9   | amd64             |
 | java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
-| adopt11        | 11           | Alpine | Hotspot  | amd64             |
-| openj9         | 8            | Alpine | OpenJ9   | amd64             |
-| openj9-11      | 11           | Alpine | OpenJ9   | amd64             |
-| multiarch      | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
+| java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |

 For example, to use Java version 15 on any supported architecture:
@@ -337,6 +320,35 @@ The [examples directory](https://github.com/itzg/docker-minecraft-server/tree/ma

 If you're looking for a simple way to deploy this to the Amazon Web Services Cloud, check out the [Minecraft Server Deployment (CloudFormation) repository](https://github.com/vatertime/minecraft-spot-pricing). This repository contains a CloudFormation template that will get you up and running in AWS in a matter of minutes. Optionally it uses Spot Pricing so the server is very cheap, and you can easily turn it off when not in use.

+### Using Docker Compose
+
+Rather than type the server options below, the port mappings above, etc
+every time you want to create new Minecraft server, you can now use
+[Docker Compose](https://docs.docker.com/compose/). Start with a
+`docker-compose.yml` file like the following:
+
+```yml
+version: "3"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    ports:
+      - 25565:25565
+    environment:
+      EULA: "TRUE"
+    tty: true
+    stdin_open: true
+    restart: unless-stopped
+```
+
+and in the same directory as that file run
+
+    docker-compose up -d
+
+Now, go play...or adjust the `environment` section to configure
+this server instance.
+
 ## Server types

 ### Running a Forge Server
@@ -421,17 +433,16 @@ An [Airplane](https://github.com/TECHNOVE/Airplane) server, which is a fork of T

    -e TYPE=AIRPLANE

-> **NOTE** only `VERSION=LATEST` is supported
-
-> **NOTE** only Java 8 and 11 are supported
+> NOTE: The `VERSION` variable is used to select an Airplane branch to download from. The available options are "LATEST" "1.17" "1.16" "PURPUR" and "PURPUR-1.16"

 Extra variables:
+- `AIRPLANE_BUILD=lastSuccessfulBuild` : set a specific Airplane 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 [Flare](https://blog.airplane.gg/flare) profiler

 ### Running a Purpur server

-A [Purpur](https://purpur.pl3x.net/) server, which is "a fork of Paper, Tuinity, Airplane with the goal of providing new and interesting configuration options".
+A [Purpur](https://purpur.pl3x.net/) server, which is "a drop-in replacement for Paper servers designed for configurability, new fun and exciting gameplay features, and high performance built on top of Tuinity."

    -e TYPE=PURPUR

@@ -440,7 +451,6 @@ A [Purpur](https://purpur.pl3x.net/) server, which is "a fork of Paper, Tuinity,
 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 [Flare](https://blog.airplane.gg/flare) profiler

 ### Running a Yatopia server

@@ -461,12 +471,14 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge

    -e TYPE=MAGMA

-> **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2"
+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.


 ### Running a Mohist server

-A [Mohist](https://github.com/Mohist-Community/Mohist) server can be used with
+A [Mohist](https://github.com/MohistMC/Mohist) server can be used with

    -e TYPE=MOHIST

@@ -592,13 +604,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`.

@@ -612,7 +624,9 @@ then you apply a workaround by adding this to the run invocation:

    -e FTB_LEGACYJAVAFIXER=true

-## Optional plugins, mods, and config attach points
+## Working with mods and plugins
+
+### Optional plugins, mods, and config attach points

 There are optional volume paths that can be attached to supply content to be copied into the data area:

@@ -635,7 +649,7 @@ These paths work well if you want to have a common set of modules in a separate

 > For more flexibility with mods/plugins preparation, you can declare directories to use in [the `MODS` variable](#downloadable-modplugin-pack-for-forge-bukkit-and-spigot-servers)

-## Auto-downloading SpigotMC/Bukkit/PaperMC plugins
+### Auto-downloading SpigotMC/Bukkit/PaperMC plugins

 The `SPIGET_RESOURCES` variable can be set with a comma-separated list of SpigotMC resource IDs to automatically download [SpigotMC resources/plugins](https://www.spigotmc.org/resources/) using [the spiget API](https://spiget.org/). Resources that are zip files will be expanded into the plugins directory and resources that are simply jar files will be moved there.

@@ -650,159 +664,65 @@ For example, the following will auto-download the [EssentialsX](https://www.spig

    -e SPIGET_RESOURCES=9089,34315

-## Replacing variables inside configs
+### Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers

-Sometimes you have mods or plugins that require configuration information that is only available at runtime.
-For example if you need to configure a plugin to connect to a database,
-you don't want to include this information in your Git repository or Docker image.
-Or maybe you have some runtime information like the server name that needs to be set
-in your config files after the container starts.
+Like the `WORLD` option above, you can specify the URL or path of a "mod pack"
+to download and install into `mods` for Forge or `plugins` for Bukkit/Spigot.
+To use this option pass the environment variable `MODPACK`, such as

-For those cases there is the option to replace defined variables inside your configs
-with environment variables defined at container runtime.
+    docker run -d -e MODPACK=http://www.example.com/mods/modpack.zip ...

-If you set the enviroment variable `REPLACE_ENV_VARIABLES` to `TRUE` the startup script
-will go thru all files inside your `/data` volume and replace variables that match your
-defined environment variables. Variables that you want to replace need to be wrapped
-inside `${YOUR_VARIABLE}` curly brackets and prefixed with a dollar sign. This is the regular
-syntax for enviromment variables inside strings or config files.
+**NOTE:** The referenced URL must be a zip file with one or more jar files at the
+top level of the zip archive. Make sure the jars are compatible with the
+particular `TYPE` of server you are running.

-Optionally you can also define a prefix to only match predefined environment variables.
+You may also download or copy over individual mods using the `MODS` environment variable. `MODS` contains a comma-separated list of
+- URL of a jar file
+- container path to a jar file
+- container path to a directory containing jar files

-`ENV_VARIABLE_PREFIX="CFG_"` <-- this is the default prefix
+  docker run -d -e MODS=https://www.example.com/mods/mod1.jar,/plugins/common,/plugins/special/mod2.jar ...

-If you want use file for value (like when use secrets) you can add suffix `_FILE` to your variable name (in  run command).
+### Remove old mods/plugins

-There are some limitations to what characters you can use.
+When the option above is specified (`MODPACK`) you can also instruct script to
+delete old mods/plugins prior to installing new ones. This behaviour is desirable
+in case you want to upgrade mods/plugins from downloaded zip file.
+To use this option pass the environment variable `REMOVE_OLD_MODS="TRUE"`, such as

-| Type  | Allowed Characters  |
-| ----- | ------------------- |
-| Name  | `0-9a-zA-Z_-`       |
-| Value | `0-9a-zA-Z_-:/=?.+` |
+    docker run -d -e REMOVE_OLD_MODS="TRUE" -e MODPACK=http://www.example.com/mods/modpack.zip ...

-Variables will be replaced in files with the following extensions:
-`.yml`, `.yaml`, `.txt`, `.cfg`, `.conf`, `.properties`.
+**WARNING:** All content of the `mods` or `plugins` directory will be deleted
+before unpacking new content from the MODPACK or MODS.

-Specific files can be excluded by listing their name (without path) in the variable `REPLACE_ENV_VARIABLES_EXCLUDES`.
+## Working with world data

-Paths can be excluded by listing them in the variable `REPLACE_ENV_VARIABLES_EXCLUDE_PATHS`. Path
-excludes are recursive. Here is an example:
-```
-REPLACE_ENV_VARIABLES_EXCLUDE_PATHS="/data/plugins/Essentials/userdata /data/plugins/MyPlugin"
-```
+### Downloadable world

-Here is a full example where we want to replace values inside a `database.yml`.
+Instead of mounting the `/data` volume, you can instead specify the URL of a ZIP file containing an archived world. It will be searched for a file `level.dat` and the containing subdirectory moved to the directory named by `$LEVEL`. This means that most of the archived Minecraft worlds downloadable from the Internet will already be in the correct format.

-```yml
+    docker run -d -e WORLD=http://www.example.com/worlds/MySave.zip ...

---
-database:
-  host: ${CFG_DB_HOST}
-  name: ${CFG_DB_NAME}
-  password: ${CFG_DB_PASSWORD}
-```
+**NOTE:** This URL must be accessible from inside the container. Therefore,
+you should use an IP address or a globally resolvable FQDN, or else the
+name of a linked container.

-This is how your `docker-compose.yml` file could look like:
+**NOTE:** If the archive contains more than one `level.dat`, then the one to select can be picked with `WORLD_INDEX`, which defaults to 1.

-```yml
-version: "3.8"
-# Other docker-compose examples in /examples
+### Cloning world from a container path

-services:
-  minecraft:
-    image: itzg/minecraft-server
-    ports:
-      - "25565:25565"
-    volumes:
-      - "mc:/data"
-    environment:
-      EULA: "TRUE"
-      ENABLE_RCON: "true"
-      RCON_PASSWORD: "testing"
-      RCON_PORT: 28016
-      # enable env variable replacement
-      REPLACE_ENV_VARIABLES: "TRUE"
-      # define an optional prefix for your env variables you want to replace
-      ENV_VARIABLE_PREFIX: "CFG_"
-      # and here are the actual variables
-      CFG_DB_HOST: "http://localhost:3306"
-      CFG_DB_NAME: "minecraft"
-      CFG_DB_PASSWORD_FILE: "/run/secrets/db_password"
-    restart: always
-  rcon:
-    image: itzg/rcon
-    ports:
-      - "4326:4326"
-      - "4327:4327"
-    volumes:
-      - "rcon:/opt/rcon-web-admin/db"
+The `WORLD` option can also be used to reference a directory or zip file that will be used as a source to clone or unzip the world directory.

-volumes:
-  mc:
-  rcon:
-
-secrets:
-  db_password:
-    file: ./db_password
-```
-
-The content of `db_password`:
-
-    ug23u3bg39o-ogADSs
-
-## Running with a custom server JAR
-
-If you would like to run a custom server JAR, set `-e TYPE=CUSTOM` and pass the custom server
-JAR via `CUSTOM_SERVER`. It can either be a URL or a container path to an existing JAR file.
-
-If it is a URL, it will only be downloaded into the `/data` directory if it wasn't already. As
-such, if you need to upgrade or re-download the JAR, then you will need to stop the container,
-remove the file from the container's `/data` directory, and start again.
-
-## Force re-download of the server file
-
-For VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, CURSEFORGE, SPONGEVANILLA server types, set
-`$FORCE_REDOWNLOAD` to some value (e.g. 'true) to force a re-download of the server file for
-the particular server type. by adding a `-e FORCE_REDOWNLOAD=true` to your command-line.
-
-For example, with PaperSpigot, it would look something like this:
+For example, the following would initially clone the world's content
+from `/worlds/basic`. Also notice in the example that you can use a
+read-only volume attachment to ensure the clone source remains pristine.

 ```
-docker run -d -v /path/on/host:/data \
-    -e TYPE=PAPER -e FORCE_REDOWNLOAD=true \
-    -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
+docker run ... -v $HOME/worlds:/worlds:ro -e WORLD=/worlds/basic
 ```

-## Using Docker Compose
-
-Rather than type the server options below, the port mappings above, etc
-every time you want to create new Minecraft server, you can now use
-[Docker Compose](https://docs.docker.com/compose/). Start with a
-`docker-compose.yml` file like the following:
-
-```yml
-version: "3.8"
-
-minecraft-server:
-  image: itzg/minecraft-server
-
-  ports:
-    - "25565:25565"
-
-  environment:
-    EULA: "TRUE"
-
-  tty: true
-  stdin_open: true
-  restart: always
-```
-
-and in the same directory as that file run
-
-    docker-compose up -d
-
-Now, go play...or adjust the `environment` section to configure
-this server instance.
+### Overwrite world on start
+The world will only be downloaded or copied if it doesn't exist already. Set `FORCE_WORLD_COPY=TRUE` to force overwrite the world on every server start.

 ## Server configuration

@@ -853,10 +773,11 @@ To whitelist players for your Minecraft server, pass the Minecraft usernames sep

 If the `WHITELIST` environment variable is not used, any user can join your Minecraft server if it's publicly accessible.

-> NOTE: When `WHITELIST` is used the server property `white-list` will automatically get set to `true`.
+> NOTE: When `WHITELIST` is used the server properties `white-list` and `whitelist` will automatically get set to `true`.

 > By default, the players in `WHITELIST` are **added** to the final `whitelist.json` file by the Minecraft server. If you set `OVERRIDE_WHITELIST` to "true" then the `whitelist.json` file will be recreated on each server startup.

+Alternatively, you can set `ENABLE_WHITELIST=true` to only set the server properties `white-list` and `whitelist` without modifying the whitelist file. In this case the whitelist is solely managed using the `whitelist add` and `whitelist remove` commands.
 ### Op/Administrator Players

 To add more "op" (aka adminstrator) users to your Minecraft server, pass the Minecraft usernames separated by commas via the `OPS` environment variable, such as
@@ -1072,73 +993,17 @@ You can set a link to a custom resource pack and set it's checksum using the `RE

 **NOTE:** `:` and `=` must be escaped using `\`. The checksum plain-text hexadecimal.

-### World Save Name
+### Level / World Save Name

 You can either switch between world saves or run multiple containers with different saves by using the `LEVEL` option,
 where the default is "world":

    docker run -d -e LEVEL=bonus ...

-**NOTE:** if running multiple containers be sure to either specify a different `-v` host directory for each
+> **NOTE:** if running multiple containers be sure to either specify a different `-v` host directory for each
 `LEVEL` in use or don't use `-v` and the container's filesystem will keep things encapsulated.

-### Downloadable world
-
-Instead of mounting the `/data` volume, you can instead specify the URL of a ZIP file containing an archived world. It will be searched for a file `level.dat` and the containing subdirectory moved to the directory named by `$LEVEL`. This means that most of the archived Minecraft worlds downloadable from the Internet will already be in the correct format.
-
-    docker run -d -e WORLD=http://www.example.com/worlds/MySave.zip ...
-
-**NOTE:** This URL must be accessible from inside the container. Therefore,
-you should use an IP address or a globally resolvable FQDN, or else the
-name of a linked container.
-
-**NOTE:** If the archive contains more than one `level.dat`, then the one to select can be picked with `WORLD_INDEX`, which defaults to 1.
-
-### Cloning world from a container path
-
-The `WORLD` option can also be used to reference a directory or zip file that will be used as a source to clone or unzip the world directory.
-
-For example, the following would initially clone the world's content
-from `/worlds/basic`. Also notice in the example that you can use a
-read-only volume attachment to ensure the clone source remains pristine.
-
-```
-docker run ... -v $HOME/worlds:/worlds:ro -e WORLD=/worlds/basic
-```
-
-### Overwrite world on start
-The world will only be downloaded or copied if it doesn't exist already. Set `FORCE_WORLD_COPY=TRUE` to force overwrite the world on every server start.
-
-### Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers
-
-Like the `WORLD` option above, you can specify the URL or path of a "mod pack"
-to download and install into `mods` for Forge or `plugins` for Bukkit/Spigot.
-To use this option pass the environment variable `MODPACK`, such as
-
-    docker run -d -e MODPACK=http://www.example.com/mods/modpack.zip ...
-
-**NOTE:** The referenced URL must be a zip file with one or more jar files at the
-top level of the zip archive. Make sure the jars are compatible with the
-particular `TYPE` of server you are running.
-
-You may also download or copy over individual mods using the `MODS` environment variable. `MODS` contains a comma-separated list of
- URL of a jar file
- container path to a jar file
- container path to a directory containing jar files
-
-    docker run -d -e MODS=https://www.example.com/mods/mod1.jar,/plugins/common,/plugins/special/mod2.jar ...
-
-### Remove old mods/plugins
-
-When the option above is specified (`MODPACK`) you can also instruct script to
-delete old mods/plugins prior to installing new ones. This behaviour is desirable
-in case you want to upgrade mods/plugins from downloaded zip file.
-To use this option pass the environment variable `REMOVE_OLD_MODS="TRUE"`, such as
-
-    docker run -d -e REMOVE_OLD_MODS="TRUE" -e MODPACK=http://www.example.com/mods/modpack.zip ...
-
-**WARNING:** All content of the `mods` or `plugins` directory will be deleted
-before unpacking new content from the MODPACK or MODS.
+> **INFO** Refer to the [data directory](#data-directory) section for a visual description of where the `$LEVEL` directory is situated.

 ### Online mode

@@ -1169,9 +1034,133 @@ Allows users to use flight on your server while in Survival mode, if they have a
 | PREVENT_PROXY_CONNECTIONS         | prevent-proxy-connections         |
 | USE_NATIVE_TRANSPORT              | use-native-transport              |
 | ENFORCE_WHITELIST                 | enforce-whitelist                 |
+| ENABLE_WHITELIST                  | white-list and whitelist          |

 ## Miscellaneous Options

+### Replacing variables inside configs
+
+Sometimes you have mods or plugins that require configuration information that is only available at runtime.
+For example if you need to configure a plugin to connect to a database,
+you don't want to include this information in your Git repository or Docker image.
+Or maybe you have some runtime information like the server name that needs to be set
+in your config files after the container starts.
+
+For those cases there is the option to replace defined variables inside your configs
+with environment variables defined at container runtime.
+
+If you set the enviroment variable `REPLACE_ENV_VARIABLES` to `TRUE` the startup script
+will go thru all files inside your `/data` volume and replace variables that match your
+defined environment variables. Variables that you want to replace need to be wrapped
+inside `${YOUR_VARIABLE}` curly brackets and prefixed with a dollar sign. This is the regular
+syntax for enviromment variables inside strings or config files.
+
+Optionally you can also define a prefix to only match predefined environment variables.
+
+`ENV_VARIABLE_PREFIX="CFG_"` <-- this is the default prefix
+
+If you want use file for value (like when use secrets) you can add suffix `_FILE` to your variable name (in  run command).
+
+There are some limitations to what characters you can use.
+
+| Type  | Allowed Characters  |
+| ----- | ------------------- |
+| Name  | `0-9a-zA-Z_-`       |
+| Value | `0-9a-zA-Z_-:/=?.+` |
+
+Variables will be replaced in files with the following extensions:
+`.yml`, `.yaml`, `.txt`, `.cfg`, `.conf`, `.properties`.
+
+Specific files can be excluded by listing their name (without path) in the variable `REPLACE_ENV_VARIABLES_EXCLUDES`.
+
+Paths can be excluded by listing them in the variable `REPLACE_ENV_VARIABLES_EXCLUDE_PATHS`. Path
+excludes are recursive. Here is an example:
+```
+REPLACE_ENV_VARIABLES_EXCLUDE_PATHS="/data/plugins/Essentials/userdata /data/plugins/MyPlugin"
+```
+
+Here is a full example where we want to replace values inside a `database.yml`.
+
+```yml
+
+---
+database:
+  host: ${CFG_DB_HOST}
+  name: ${CFG_DB_NAME}
+  password: ${CFG_DB_PASSWORD}
+```
+
+This is how your `docker-compose.yml` file could look like:
+
+```yml
+version: "3.8"
+# Other docker-compose examples in /examples
+
+services:
+  minecraft:
+    image: itzg/minecraft-server
+    ports:
+      - "25565:25565"
+    volumes:
+      - "mc:/data"
+    environment:
+      EULA: "TRUE"
+      ENABLE_RCON: "true"
+      RCON_PASSWORD: "testing"
+      RCON_PORT: 28016
+      # enable env variable replacement
+      REPLACE_ENV_VARIABLES: "TRUE"
+      # define an optional prefix for your env variables you want to replace
+      ENV_VARIABLE_PREFIX: "CFG_"
+      # and here are the actual variables
+      CFG_DB_HOST: "http://localhost:3306"
+      CFG_DB_NAME: "minecraft"
+      CFG_DB_PASSWORD_FILE: "/run/secrets/db_password"
+    restart: always
+  rcon:
+    image: itzg/rcon
+    ports:
+      - "4326:4326"
+      - "4327:4327"
+    volumes:
+      - "rcon:/opt/rcon-web-admin/db"
+
+volumes:
+  mc:
+  rcon:
+
+secrets:
+  db_password:
+    file: ./db_password
+```
+
+The content of `db_password`:
+
+    ug23u3bg39o-ogADSs
+
+### Running with a custom server JAR
+
+If you would like to run a custom server JAR, set `-e TYPE=CUSTOM` and pass the custom server
+JAR via `CUSTOM_SERVER`. It can either be a URL or a container path to an existing JAR file.
+
+If it is a URL, it will only be downloaded into the `/data` directory if it wasn't already. As
+such, if you need to upgrade or re-download the JAR, then you will need to stop the container,
+remove the file from the container's `/data` directory, and start again.
+
+### Force re-download of the server file
+
+For VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, CURSEFORGE, SPONGEVANILLA server types, set
+`$FORCE_REDOWNLOAD` to some value (e.g. 'true) to force a re-download of the server file for
+the particular server type. by adding a `-e FORCE_REDOWNLOAD=true` to your command-line.
+
+For example, with PaperSpigot, it would look something like this:
+
+```
+docker run -d -v /path/on/host:/data \
+    -e TYPE=PAPER -e FORCE_REDOWNLOAD=true \
+    -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
+```
+
 ### Running as alternate user/group ID

 By default, the container will switch to user ID 1000 and group ID 1000;
@@ -1208,13 +1197,25 @@ For some cases, if e.g. after removing mods, it could be necessary to startup mi

 ### Interactive and Color Console

-If you would like to attach to the Minecraft server console with color and interactive capabilities, then add
+If you would like to `docker attach` to the Minecraft server console with color and interactive capabilities, then add

 ```
  -e EXEC_DIRECTLY=true
 ```

-> **NOTE** this will bypass graceful server shutdown handling when using `docker stop`, so be sure to use `rcon-cli` or console commands to `stop` the server.
+> **NOTES**
+>
+> This feature doesn't work via rcon, so you will need to `docker attach` to the container. Use the sequence Ctrl-P, Ctrl-Q to detach. 
+> 
+> This will bypass graceful server shutdown handling when using `docker stop`, so be sure the server console's `stop` command.
+> 
+> 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

@@ -1292,7 +1293,7 @@ disable that by passing `-e GUI=FALSE`.

 ### Stop Duration

-When the container is signalled to stop, the Minecraft process wrapper will attempt to send a "stop" command via RCON or console and waits for the process to gracefully finish. By defaul it waits 60 seconds, but that duration can be configured by setting the environment variable `STOP_DURATION` to the number of seconds.
+When the container is signalled to stop, the Minecraft process wrapper will attempt to send a "stop" command via RCON or console and waits for the process to gracefully finish. By default it waits 60 seconds, but that duration can be configured by setting the environment variable `STOP_DURATION` to the number of seconds.

 ## Autopause

@@ -1306,7 +1307,7 @@ Of course, even loaded chunks are not ticked when the process is stopped.

 **You must greatly increase or disable max-tick-time watchdog functionality.** 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 to a very large value or -1 to disable it entirely, which is highly recommended. That can be set with `MAX_TICK_TIME` as described in [the section below](#max-tick-time).

-> **NOTE:** Non-vanilla versions might have their own configuration file, you might have to disable their watchdogs separately (e.g. PAPER Servers).
+> **NOTE:** Non-vanilla versions might have their own configuration file, you might have to disable their watchdogs separately. For PaperMC servers, you need to send the JVM flag `-Ddisable.watchdog=true`, this can be done with the docker env variable `-e JVM_DD_OPTS=disable.watchdog:true`

 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.

@@ -1336,9 +1337,7 @@ The following environment variables define the behaviour of auto-pausing:

 ## Running on RaspberryPi

-To run this image on a RaspberryPi 3 B+, 4, or newer, use any of the image tags [list in the Java version section](#running-minecraft-server-on-different-java-version) that specify `armv7` for the architecture, such as
-
-    itzg/minecraft-server:multiarch
+To run this image on a RaspberryPi 3 B+, 4, or newer, use any of the image tags [list in the Java version section](#running-minecraft-server-on-different-java-version) that specify `armv7` for the architecture, which includes `itzg/minecraft-server:latest`.

 > NOTE: you may need to lower the memory allocation, such as `-e MEMORY=750m`

--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -4,13 +4,11 @@
 branches_list=(
  'java8'
  'java8-multiarch'
-  'openj9'
-  'openj9-11'
-  'adopt11'
-  'java15'
-  'java15-openj9'
+  'java8-openj9'
+  'java11'
+  'java11-openj9'
  'java16'
-  'multiarch'
+  'java16-openj9'
  'multiarch-latest'
  )

--- a/examples/docker-compose-fabric.yml
+++ b/examples/docker-compose-fabric.yml
@@ -0,0 +1,15 @@
+version: "3"
+
+services:
+  mc:
+    image: ${IMAGE:-itzg/minecraft-server}
+    environment:
+      EULA: "true"
+      TYPE: FABRIC
+    ports:
+      - 25565:25565
+    volumes:
+      - fabric:/data
+
+volumes:
+  fabric: {}
--- a/examples/docker-compose-spiget.yml
+++ b/examples/docker-compose-spiget.yml
@@ -0,0 +1,17 @@
+version: "3"
+
+services:
+  mc:
+    # Only using IMAGE variable to allow for local testing
+    image: ${IMAGE:-itzg/minecraft-server}
+    ports:
+      - 25565:25565
+    environment:
+      EULA: "TRUE"
+      TYPE: SPIGOT
+      SPIGET_RESOURCES: 9089,34315,3836
+    volumes:
+      - data:/data
+
+volumes:
+  data: {}
--- a/examples/modpacks/README.md
+++ b/examples/modpacks/README.md
@@ -1,3 +1,3 @@
 Place 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>.
+The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/3012800>.
--- a/36
+++ b/36
@@ -5,22 +5,38 @@ IFS=$'\n\t'
 . ${SCRIPTS:-/}start-utils
 isDebugging && set -x

-JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
-
-if [ "${JAVA_VER}" != "8" ] && [ "${JAVA_VER}" != "11" ]; then
-  log "ERROR: Airplane server type only supports Java versions 8 and 11"
+if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.16" ] && [ "${VERSION}" != "1.17" ] && [ "${VERSION}" != "PURPUR" ] && [ "${VERSION}" != "PURPUR-1.16" ] ; then
+  log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=1.17, VERSION=1.16, VERSION=PURPUR or VERSION=PURPUR-1.16. Note that these are branches, not #.#.# versions."
  exit 1
 fi

-if [ "${VERSION}" != "LATEST" ]; then
-  log "ERROR: Airplane server type only supports VERSION=LATEST"
-  exit 1
+: ${AIRPLANE_BUILD:=lastSuccessfulBuild}
+: ${AIRPLANE_TYPE:=airplane}
+
+if  [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.17" ]; then
+  AIRPLANE_BRANCH="1.17"
 fi

-export SERVER=airplane-${VANILLA_VERSION}-jdk${JAVA_VER}.jar
+if [ "${VERSION}" = "1.16" ]; then
+  AIRPLANE_BRANCH="1.16"
+fi

-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://dl.airplane.gg/latest/Airplane-JDK${JAVA_VER}/launcher-airplane.jar"
+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"
+
+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"
    log "Downloading Airplane from $downloadUrl ..."
    curl -fsSL -o "$SERVER" "$downloadUrl"
    if [ ! -f "$SERVER" ]; then
--- a/6
+++ b/6
@@ -64,7 +64,11 @@ function downloadSpigot {
  fi

  if [[ -z $downloadUrl ]]; then
-    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
+    if versionLessThan 1.16.5; then
+      downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
+    else
+      downloadUrl="https://download.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
+    fi
  fi

  setServerVar
--- a/7
+++ b/7
@@ -85,13 +85,14 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
      fi

      log "Installing forge server"
-      (cd $(dirname "${forgeInstallerJar}"); java -jar $(basename "${forgeInstallerJar}") --installServer)
+      dirOfInstaller=$(dirname "${forgeInstallerJar}")
+      (cd "${dirOfInstaller}"; java -jar $(basename "${forgeInstallerJar}") --installServer)
    fi

    echo "${FTB_SERVER_MOD}" > $installMarker
  fi

-  export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
+  export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
  if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then
    log "ERROR unable to locate installed forge server jar"
    isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar"
@@ -184,7 +185,7 @@ 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')
+    forgeJar=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
    if [[ "$forgeJar" ]]; then
      export FTB_BASE_DIR=$(dirname "${forgeJar}")
      log "No entry script found, so building one for ${forgeJar}"
--- a/4
+++ b/4
@@ -52,12 +52,14 @@ fi

 isDebugging && cat version.json
 forgeVersion=$(jq -r '.targets|unique[] | select(.name == "forge") | .version' version.json)
+fabricVersion=$(jq -r '.targets|unique[] | select(.name == "fabric") | .version' version.json)
 mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)

 variants=(
  forge-${mcVersion}-${forgeVersion}.jar
  forge-${mcVersion}-${forgeVersion}-universal.jar
  forge-${mcVersion}-${forgeVersion}-${mcVersion}-universal.jar
+  fabric-${mcVersion}-${fabricVersion}-server-launch.jar
 )
 for f in ${variants[@]}; do
  if [ -f $f ]; then
@@ -66,7 +68,7 @@ for f in ${variants[@]}; do
  fi
 done
 if ! [ -v SERVER ]; then
-  log "ERROR unable to locate the installed forge server jar"
+  log "ERROR unable to locate the installed FTB server jar"
  ls *.jar
  exit 2
 fi
--- a/75
+++ b/75
@@ -3,54 +3,43 @@ set -eu

 . ${SCRIPTS:-/}start-utils

+requireVar VANILLA_VERSION
 export TYPE=FABRIC
+export SERVER=fabric-server-${VANILLA_VERSION}.jar

-FABRIC_INSTALLER=${FABRIC_INSTALLER:-}
-FABRIC_INSTALLER_URL=${FABRIC_INSTALLER_URL:-}
-FABRIC_INSTALLER_VERSION=${FABRIC_INSTALLER_VERSION:-${FABRICVERSION:-LATEST}}
-if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
-  log "Checking Fabric version information."
-  case $FABRIC_INSTALLER_VERSION in
-    LATEST)
+isDebugging && set -x
+
+if [[ ! -e ${SERVER} ]]; then
+
+  : ${FABRIC_INSTALLER:=}
+  : ${FABRIC_INSTALLER_URL:=}
+  : ${FABRIC_INSTALLER_VERSION:=${FABRICVERSION:-LATEST}}
+
+  if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
+    log "Checking Fabric version information."
+    if [[ ${FABRIC_INSTALLER_VERSION^^} = LATEST ]]; then
      FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
-      ;;
-  esac
+    fi

-  FABRIC_INSTALLER="/tmp/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
-  markerVersion=$FABRIC_INSTALLER_VERSION
+    FABRIC_INSTALLER="fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+    FABRIC_INSTALLER_URL="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+  elif [[ -z $FABRIC_INSTALLER ]]; then
+    FABRIC_INSTALLER="fabric-installer.jar"
+  elif [[ ! -e $FABRIC_INSTALLER ]]; then
+    log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
+    exit 2
+  fi

-elif [[ -z $FABRIC_INSTALLER ]]; then
-  FABRIC_INSTALLER="/tmp/fabric-installer.jar"
-  markerVersion=custom
-elif [[ ! -e $FABRIC_INSTALLER ]]; then
-  log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
-  exit 2
-fi
-
-installMarker="/data/.fabric-installed-${VANILLA_VERSION}-${markerVersion}"
-
-debug Checking for installMarker ${installMarker}
-if [[ ! -e $installMarker ]]; then
  if [[ ! -e $FABRIC_INSTALLER ]]; then
-    if [[ -z $FABRIC_INSTALLER_URL ]]; then
-      log "Downloading installer version $FABRIC_INSTALLER_VERSION"
-      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
-      log "...trying $downloadUrl"
-      curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
-    else
-      log "Downloading $FABRIC_INSTALLER_URL ..."
-      if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
-        log "Failed to download from given location $FABRIC_INSTALLER_URL"
-        exit 2
-      fi
+    log "Downloading $FABRIC_INSTALLER_URL ..."
+    if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
+      log "Failed to download from given location $FABRIC_INSTALLER_URL"
+      exit 2
    fi
  fi

-  if isDebugging; then
-    debug "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
-  else
-    log "Installing Fabric using $FABRIC_INSTALLER"
-  fi
+  log "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
+
  tries=3
  set +e
  while ((--tries >= 0)); do
@@ -67,13 +56,9 @@ if [[ ! -e $installMarker ]]; then
    log "Fabric failed to install after several tries." >&2
    exit 10
  fi
-  export SERVER=fabric-server-launch.jar
-  log "Using server $SERVER"
-  echo $SERVER > $installMarker

-else
-  export SERVER=$(< $installMarker)
+  mv fabric-server-launch.jar ${SERVER}
 fi

-# Contineut to Final Setup
+# Continue to Final Setup
 exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/5
+++ b/5
@@ -1,7 +1,6 @@
 #!/bin/bash

 . ${SCRIPTS:-/}start-utils
-export TYPE=FORGE
 : ${FORGEVERSION:=RECOMMENDED}
 isDebugging && set -x

@@ -47,7 +46,7 @@ elif [[ ! -e $FORGE_INSTALLER ]]; then
  log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
  exit 2
 else
-  shortForgeVersion=$VANILLA_VERSION-custom
+  shortForgeVersion=$VANILLA_VERSION-${FORGE_INSTALLER_CUSTOM_VERSION:-custom}
 fi

 installMarker="/data/.forge-installed-$shortForgeVersion"
@@ -68,7 +67,7 @@ if [ ! -e $installMarker ]; then
          log "Unable to compute URL for $normForgeVersion"
          exit 2
        fi
-        downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
+        downloadUrl=https://maven.minecraftforge.net/net/minecraftforge/forge/$fn
        log "...trying $downloadUrl"
        if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
          break
--- a/89
+++ b/89
@@ -1,18 +1,93 @@
 #!/bin/bash

 . ${SCRIPTS:-/}start-utils
+export SKIP_LOG4J_CONFIG=true

-export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
+isDebugging && set -x

-# 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"
+: ${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=$?)"
  exit 1
 fi

-export SKIP_LOG4J_CONFIG=true
+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

 # Continue to Final Setup
 exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/6
+++ b/6
@@ -8,12 +8,12 @@ isDebugging && set -x
 requireVar VANILLA_VERSION
 : ${MOHIST_BUILD:=lastSuccessfulBuild}

-mohistJobs=https://ci.codemc.io/job/Mohist-Community/job/
+mohistJobs=https://ci.codemc.io/job/MohistMC/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 "       check https://ci.codemc.io/job/MohistMC/ for available versions"
  log "       and set VERSION accordingly"
  exit 1
 fi
@@ -26,7 +26,7 @@ buildRelPath=$(
 baseName=$(basename "${buildRelPath}")
 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 "       check https://ci.codemc.io/job/MohistMC/ for available versions"
  log "       and set VERSION accordingly"
  exit 1
 fi
--- a/4
+++ b/4
@@ -10,7 +10,7 @@ isDebugging && set -x
 : ${FORCE_REDOWNLOAD:=false}

 if [[ ${PURPUR_BUILD} == LATEST ]]; then
-  PURPUR_BUILD=$(curl -fsSL "https://purpur.pl3x.net/api/v1/purpur/${VANILLA_VERSION}" |
+  PURPUR_BUILD=$(curl -fsSL "https://api.pl3x.net/v2/purpur/${VANILLA_VERSION}" |
    jq -r '.builds.latest' || echo "")
  if [[ -z ${PURPUR_BUILD} ]]; then
    log "ERROR: Failed to locate a Purpur build for ${VANILLA_VERSION}."
@@ -22,7 +22,7 @@ fi
 export SERVER="purpur-${VANILLA_VERSION}-${PURPUR_BUILD}.jar"

 if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="https://purpur.pl3x.net/api/v1/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
+    downloadUrl="https://api.pl3x.net/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
    log "Downloading Purpur from $downloadUrl ..."
    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
      log "ERROR: failed to download from $downloadUrl (status=$?)"
--- a/10
+++ b/10
@@ -3,16 +3,16 @@
 . ${SCRIPTS:-/}start-utils

 if [ "${VERSION}" != "LATEST" ]; then
-  log "ERROR: Tunity server type only supports VERSION=LATEST"
+  log "ERROR: Tuinity server type only supports VERSION=LATEST"
  exit 1
 fi

-: ${TUNITY_BUILD:=lastSuccessfulBuild}
-export SERVER=tunity-${VANILLA_VERSION}-${TUNITY_BUILD}.jar
+: ${TUINITY_BUILD:=lastSuccessfulBuild}
+export SERVER=tuinity-${VANILLA_VERSION}-${TUINITY_BUILD}.jar

 if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUNITY_BUILD}/artifact/tuinity-paperclip.jar"
-    log "Downloading Tunity (build $TUNITY_BUILD) from $downloadUrl ..."
+    downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUINITY_BUILD}/artifact/tuinity-paperclip.jar"
+    log "Downloading Tuinity (build $TUINITY_BUILD) from $downloadUrl ..."
    curl -fsSL -o "$SERVER" "$downloadUrl"
    if [ ! -f "$SERVER" ]; then
      log "ERROR: failed to download from $downloadUrl (status=$?)"
--- a/2
+++ b/2
@@ -6,7 +6,7 @@ IFS=$'\n\t'
 isDebugging && set -x

 : ${VANILLA_VERSION:?}
-: ${RELEASE:=stable}
+: ${RELEASE:=latest}
 : ${FORCE_REDOWNLOAD:=false}

 requireEnum RELEASE stable latest
--- a/10
+++ b/10
@@ -25,16 +25,16 @@ fi

 if [ -d /mods ]; then
  log "Copying any mods over..."
-  mkdir -p $COPY_MODS_DEST
-  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods/ $COPY_MODS_DEST
+  mkdir -p "${COPY_MODS_DEST}"
+  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods/ "${COPY_MODS_DEST}"
 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
+  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 $@
--- a/4
+++ b/4
@@ -19,7 +19,7 @@ function setServerProp {
      sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
    else
      log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}"
-      echo "${prop}=${var//\\/\\\\}" >> "$SERVER_PROPERTIES"
+      echo "${prop}=${var}" >> "$SERVER_PROPERTIES"
    fi
  else
    isDebugging && log "Skip setting ${prop}"
@@ -27,7 +27,7 @@ function setServerProp {
 }

 function customizeServerProps {
-  if [ -n "$WHITELIST" ]; then
+  if [ -n "$WHITELIST" ] || isTrue ${ENABLE_WHITELIST:-false}; then
    log "Creating whitelist"
    setServerProp "whitelist" "true"
    setServerProp "white-list" "true"
--- a/19
+++ b/19
@@ -173,6 +173,10 @@ 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
@@ -212,6 +216,11 @@ EOF
    "${FTB_SERVER_START}"
  )

+  if isTrue ${SETUP_ONLY:=false}; then
+    echo "SETUP_ONLY: ${finalArgs[@]}"
+    exit
+  fi
+
  if isTrue ${DEBUG_EXEC}; then
    set -x
  fi
@@ -220,6 +229,10 @@ 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
@@ -236,6 +249,11 @@ else
    "$@" $EXTRA_ARGS
  )

+  if isTrue ${SETUP_ONLY:=false}; then
+    echo "SETUP_ONLY: java ${finalArgs[@]}"
+    exit
+  fi
+
  if isTrue ${DEBUG_EXEC}; then
    set -x
  fi
@@ -246,3 +264,4 @@ else
    exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
  fi
 fi
+
--- a/45
+++ b/45
@@ -6,6 +6,7 @@ IFS=$'\n\t'
 handleDebugMode

 : ${SPIGET_RESOURCES:=}
+: ${SPIGET_DOWNLOAD_TOLERANCE:=5} # in minutes

 containsJars() {
  file=${1?}
@@ -26,6 +27,49 @@ getResourceFromSpiget() {

  log "Downloading resource ${resource} ..."

+  mkdir -p /data/plugins
+
+  versionfile="/data/plugins/.${resource}-version.json"
+  versionfileNew="/tmp/.${resource}-version.json"
+
+  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
+    else
+      log "resource '${resource}' not checked because version meta file newer than '${SPIGET_DOWNLOAD_TOLERANCE}' minutes"
+    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
@@ -33,7 +77,6 @@ getResourceFromSpiget() {
    exit 2
  fi

-  mkdir -p /data/plugins
  if containsJars "${tmpfile}"; then
    log "Extracting contents of resource ${resource} into plugins"
    unzip -o -q -d /data/plugins "${tmpfile}"
--- a/tests/docker-compose.test.yml
+++ b/tests/docker-compose.test.yml
@@ -10,6 +10,9 @@ services:
    restart: "no"
    build:
      context: ..
+      args:
+        TARGETOS: linux
+        TARGETARCH: amd64
      cache_from:
      - itzg/minecraft-server:latest
    environment:
Author	SHA1	Message	Date
Geoff Bourne	3ba8889194	Auto-merging via docker-versions-create	2021-08-01 12:14:17 -05:00
itzg	327f21f1bb	docs: Auto update markdown TOC	2021-08-01 17:09:37 +00:00
Geoff Bourne	c96d6b2958	Added support for STOP_SERVER_ANNOUNCE_DELAY	2021-08-01 12:09:18 -05:00
Geoff Bourne	c144da4485	Auto-merging via docker-versions-create	2021-07-31 09:28:40 -05:00
itzg	da8fb37317	docs: Auto update markdown TOC	2021-07-31 14:24:59 +00:00
Geoff Bourne	4d7e29cb3a	Corrected support for Magma dev channel forge-based installer	2021-07-31 09:24:38 -05:00
Geoff Bourne	2a1f5b7500	Auto-merging via docker-versions-create	2021-07-26 19:36:39 -05:00
itzg	17099320e9	docs: Auto update markdown TOC	2021-07-27 00:33:11 +00:00
Geoff Bourne	f3dbb4dd2d	Added support for Magma dev channel downloads	2021-07-26 19:32:26 -05:00
Geoff Bourne	1725a6ed14	Merge branch 'master' into java11-openj9	2021-07-25 18:21:40 -05:00
Geoff Bourne	b3b3cdde08	Don't warn about Forge on Java 8 for 1.17+	2021-07-25 09:50:40 -05:00
Geoff Bourne	8ab55e1ef3	Auto-merging via docker-versions-create	2021-07-25 09:37:56 -05:00
itzg	b8cd510a0e	docs: Auto update markdown TOC	2021-07-24 21:26:28 +00:00
Geoff Bourne	0d5eb2ea9e	docs: fixed heading depth #988	2021-07-24 16:26:09 -05:00
Geoff Bourne	32a5ab5138	Auto-merging via docker-versions-create	2021-07-23 21:28:41 -05:00
Geoff Bourne	2b0fd2e5c0	Added support for Forge 1.17's run.sh mechanism #986	2021-07-23 21:17:05 -05:00
Jawa_Juice	4168821ec4	Reflect different jar names for airplane/airplanepurpur (#985 )	2021-07-21 10:16:05 -05:00
itzg	6353488db7	docs: Auto update markdown TOC	2021-07-18 21:20:49 +00:00
Geoff Bourne	b446d4cc3f	docs: added recommendation of management layer	2021-07-18 16:19:57 -05:00
Geoff Bourne	fb97af317e	Auto-merging via docker-versions-create	2021-07-17 21:15:45 -05:00
Geoff Bourne	16b2762025	Removed extra quotes in spiget log when resource already new enough	2021-07-17 21:11:21 -05:00
Geoff Bourne	fe758aab61	Auto-merging via docker-versions-create	2021-07-17 20:58:31 -05:00
Daniel Ramp	c5a3e2e376	Cache spiget version resolution (#978 )	2021-07-17 18:44:18 -05:00
Geoff Bourne	4c2868f6c9	Auto-merging via docker-versions-create	2021-07-17 18:05:20 -05:00
Geoff Bourne	5018298c81	Fixed log for existing spiget resource #981	2021-07-17 17:57:15 -05:00
Geoff Bourne	37b81aa0be	Fixed issue with unset FORCE_REDOWNLOAD with TYPE=AIRPLANE #979	2021-07-16 07:26:49 -05:00
Jawa_Juice	6a3a0465a4	Move to Pl3x DL API V2 (#977 )	2021-07-15 16:51:18 -05:00
itzg	34d67d6018	docs: Auto update markdown TOC	2021-07-15 13:34:00 +00:00
Geoff Bourne	9c4403d7ff	docs: corrected compose snippets within README	2021-07-15 08:33:43 -05:00
Geoff Bourne	919aff0080	Auto-merging via docker-versions-create	2021-07-14 18:43:24 -05:00
Daniel Ramp	3c0566cb87	fix: SPIGET_RESOURCES not always download (#975 ) implemented to only re-download SPIGET resources with REMOVE_OLD_MODS enabled fixes #974 partially	2021-07-14 18:42:34 -05:00
Geoff Bourne	8504cf7caf	Auto-merging via docker-versions-create	2021-07-12 19:10:45 -05:00
itzg	4357066cdf	docs: Auto update markdown TOC	2021-07-13 00:03:34 +00:00
Jawa_Juice	67ca9a7fc4	Update Airplane branches for 1.17 release (#968 ) * Update branches for official 1.17/1.17.1 releases * Reflect Airplane 1.17 release	2021-07-12 19:03:17 -05:00
itzg	9c9c295a79	docs: Auto update markdown TOC	2021-07-12 14:24:37 +00:00
silence_eternal	daa3292000	docs: Update README with watchdog disable for autopause (#967 )	2021-07-12 09:24:20 -05:00
itzg	2da5e2b2ec	docs: Auto update markdown TOC	2021-07-11 18:28:34 +00:00
Geoff Bourne	c5119ad27b	docs: Clarified docker attach usage with interactive, color console	2021-07-11 13:28:17 -05:00
Geoff Bourne	4808507da8	Simplified and improved multi-version handling for Fabric #964	2021-07-10 14:56:10 -05:00
Geoff Bourne	101a7486f2	Auto-merging via docker-versions-create	2021-07-09 19:59:30 -05:00
Geoff Bourne	11a286fe26	Bukkit/Spigot download URL switched by VERSION #962	2021-07-09 19:55:46 -05:00
Geoff Bourne	80e576db2d	Auto-merging via docker-versions-create	2021-07-08 18:00:48 -05:00
Bram Ceulemans	ca80b4730f	Update start-deployAirplane (#960 )	2021-07-08 17:56:06 -05:00
Geoff Bourne	3a73e47b83	Auto-merging via docker-versions-create	2021-07-08 08:04:52 -05:00
Geoff Bourne	80a8ce8a46	ci: removed merge-variants workflow since GHA won't trigger branch builds	2021-07-08 08:01:43 -05:00
itzg	62824051c8	Auto-merging via docker-versions-create	2021-07-08 12:56:06 +00:00
Geoff Bourne	d804323cab	Updated getbukkit download URL #958	2021-07-08 07:55:31 -05:00
Geoff Bourne	c4a2403943	Auto-merging via docker-versions-create	2021-07-08 07:39:53 -05:00
Pascal Sthamer	cbaef446ac	fix: don't echo double-double-quotes to server.properties (#954 ) Using `sed`, we need to escape double quotes, but with `echo` we can just use the variable as-is. Closes #949	2021-07-07 09:56:16 -05:00
NyCode	8aa1312ae2	Fix typo: tunity -> tuinity (#951 )	2021-07-06 07:22:01 -05:00
dependabot[bot]	7ec09fcfe9	build(deps): bump docker/build-push-action from 2.5.0 to 2.6.1 (#950 )	2021-07-05 07:09:06 -05:00
itzg	2aad0a9407	Auto-merging via docker-versions-create	2021-07-04 19:54:06 +00:00
itzg	c090095e08	docs: Auto update markdown TOC	2021-07-04 19:53:56 +00:00
Geoff Bourne	f24bc00eb9	docs: link to data directory section from level / world save name section	2021-07-04 14:53:36 -05:00
Geoff Bourne	6ead8c3cf0	Auto-merging from master	2021-07-03 14:25:28 -05:00
Geoff Bourne	f91ee5d245	ci: fixed publishing of latest image for master branch only #946	2021-07-03 14:16:10 -05:00
Geoff Bourne	3a18a19583	ci: auto-merge from master	2021-07-02 16:01:23 -05:00
Geoff Bourne	dd6700e659	ci: removed branch name qualifier in gha caching	2021-07-02 15:46:40 -05:00
itzg	f620b09134	Auto-merging via docker-versions-create	2021-07-02 16:56:00 +00:00
Austin Keller	ca8a27babe	Fix unquoted COPY_MODS_DEST and COPY_CONFIG_DEST variables (#942 )	2021-07-02 11:55:34 -05:00
itzg	2838251c67	Auto-merging via docker-versions-create	2021-06-28 12:14:11 +00:00
itzg	19cc894662	docs: Auto update markdown TOC	2021-06-28 12:13:58 +00:00
Audition-CSBlock	15320f0eb2	improve readme (#939 )	2021-06-28 07:13:40 -05:00
itzg	f7cff34527	Auto-merging via docker-versions-create	2021-06-27 13:13:17 +00:00
itzg	af758af51a	docs: Auto update markdown TOC	2021-06-27 13:13:05 +00:00
Pascal Sthamer	9d231801da	Allow to enable the whitelist without modifying the whitelist file (#937 )	2021-06-27 08:12:51 -05:00
itzg	acdf8c35fa	Auto-merging via docker-versions-create	2021-06-24 12:47:11 +00:00
itzg	33c2154a98	docs: Auto update markdown TOC	2021-06-24 12:47:02 +00:00
Jawa_Juice	f890b316da	Correct AirplanePurpur branch name (#936 )	2021-06-24 07:46:40 -05:00
Geoff Bourne	c5f2bf1059	Auto-merging via docker-versions-create	2021-06-23 22:34:57 -05:00
itzg	2e4cf0b731	docs: Auto update markdown TOC	2021-06-24 03:30:11 +00:00
Jawa_Juice	f5a319b0b3	Move to new Airplane download system (#933 ) Co-authored-by: Jawa-Juice <Jawa-Juice@users.noreply.github.com>	2021-06-23 22:29:58 -05:00
Geoff Bourne	2533d2c694	ci: merge-variants: revert previous change	2021-06-23 22:29:24 -05:00
Geoff Bourne	b1fed81821	ci: merge-variants: skip any workflow changes	2021-06-23 22:24:12 -05:00
Geoff Bourne	0064c0357f	ci: merge-variants: fetch all history and batch mode	2021-06-23 22:11:41 -05:00
Geoff Bourne	20cd8cce1d	ci: fixed typo in calling docker-versions-create.sh	2021-06-23 22:07:32 -05:00
Geoff Bourne	bc8af2784f	ci: added merge-variants workflow	2021-06-23 21:57:32 -05:00
Geoff Bourne	e300810a16	ci: fixed repo name in workflows conditional	2021-06-23 21:20:37 -05:00
Geoff Bourne	33b48a8a4b	ci: used ${{ }} syntax in job conditional	2021-06-23 21:09:20 -05:00
Geoff Bourne	6f2f1174e6	ci: limited build-multiarch workflow to itzg's	2021-06-23 21:07:22 -05:00
Geoff Bourne	adbe75ae7e	ci: limits generate-toc workflow to itzg's	2021-06-23 21:06:29 -05:00
itzg	dae2add713	docs: Auto update markdown TOC	2021-06-22 23:39:21 +00:00
Christoph Mittermaier	38946fd294	fixed typo in readme (#932 )	2021-06-22 18:39:05 -05:00
Geoff Bourne	1f25fae04f	Auto-merging via docker-versions-create	2021-06-20 12:49:56 -05:00
Duncan X Simpson	047ef107ae	Modify start-deployFTBA to allow Fabric FTB packs (#926 ) Fixes #912 Co-authored-by: Duncan X Simpson <duncan@k7dxs.net>	2021-06-20 12:27:18 -05:00
basisbit	1bb2f92f5b	Workaround: Change default RELEASE of Yatopia (#922 )	2021-06-16 07:34:38 -05:00
itzg	727a1f29d1	docs: Auto update markdown TOC	2021-06-09 12:35:19 +00:00
Jawa_Juice	012bd3a307	Support Java versions above 11 for Airplane (#917 )	2021-06-09 07:35:00 -05:00
itzg	ae5b19b0aa	docs: Auto update markdown TOC	2021-06-07 01:38:43 +00:00
Jawa_Juice	81d9c55eee	Reflect Pupur's removal of Airplane patches (#910 )	2021-06-06 20:38:29 -05:00
Geoff Bourne	caffa2fd8d	Auto-merging via docker-versions-create	2021-06-05 17:53:21 -05:00
Erik Selberg	90cfe0e151	fix bad find statement in CurseForge handling (#901 ) Co-authored-by: Erik Selberg <erik.selberg@grabtaxi.com> Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>	2021-06-05 17:46:59 -05:00
dependabot[bot]	491800280c	build(deps): bump docker/build-push-action from 2.4.0 to 2.5.0 (#904 )	2021-06-01 12:33:42 -05:00
dependabot[bot]	d60c2e0815	build(deps): bump actions/cache from 2.1.5 to 2.1.6 (#903 )	2021-05-31 08:03:12 -05:00
dependabot[bot]	fb0babe261	build(deps): bump docker/setup-qemu-action from 1.1.0 to 1.2.0 (#902 )	2021-05-31 08:02:39 -05:00
Niek Candaele	e6bc8abdc1	fix: update Sky Factory version link (#898 )	2021-05-27 07:41:05 -05:00
Geoff Bourne	8de8eb3104	Auto-merging via docker-versions-create	2021-05-24 20:52:01 -05:00
tonymmm1	fbee644b4e	Fix Forge download (#890 )	2021-05-24 20:47:51 -05:00
Geoff Bourne	aaf327b308	Added SETUP_ONLY option #878	2021-05-23 12:39:21 -05:00
itzg	d404e0f50e	docs: Auto update markdown TOC	2021-05-23 17:29:03 +00:00
Geoff Bourne	c5bb83c6d0	ci: deprecated java15 since java16 is now primary	2021-05-23 12:28:42 -05:00
Geoff Bourne	2d3fa3c09e	Merge branch 'master' into java11-openj9	2021-05-23 12:27:10 -05:00
Geoff Bourne	8bf3b64831	ci: changed build flavor latest=true	2021-05-23 12:24:13 -05:00
Geoff Bourne	f7b3c77f78	Merge from master	2021-05-22 13:46:22 -05:00
Geoff Bourne	9ff04f8637	ci: auto 'latest' tag on master	2021-05-22 10:48:44 -05:00
itzg	dd7953ab4c	docs: Auto update markdown TOC	2021-05-22 13:59:05 +00:00
Geoff Bourne	23fde3387a	docs: group related mods and worlds sections	2021-05-22 08:58:42 -05:00
Geoff Bourne	d968048ef5	Auto-merging via docker-versions-create	2021-05-21 23:02:53 -05:00
Geoff Bourne	ecbdb2b18d	ci: use flavor config in docker meta	2021-05-21 23:00:27 -05:00
Geoff Bourne	6d26ca04be	Auto-merging via docker-versions-create	2021-05-21 22:50:55 -05:00
itzg	373921777a	docs: Auto update markdown TOC	2021-05-22 03:44:27 +00:00
Geoff Bourne	577eef3631	Merge branch 'master' into java11-openj9 # Conflicts: # .github/workflows/build-multiarch.yml # docker-versions-create.sh	2021-05-21 22:41:16 -05:00
Geoff Bourne	2f489b04ae	docs: replaced openj9-11 with java11-openj9	2021-05-21 22:40:29 -05:00
Geoff Bourne	21d7fb476b	ci: added java11-openj9 branch	2021-05-21 22:37:40 -05:00
Geoff Bourne	a2c393ccc5	docs: added java8-openj9 in place of openj9 image tag	2021-05-21 22:34:45 -05:00
itzg	73a11c91d2	docs: Auto update markdown TOC	2021-05-22 03:28:50 +00:00
Geoff Bourne	8673f919fd	docs: adjusted image version mentioned for RaspberryPi	2021-05-21 22:28:32 -05:00
Geoff Bourne	1e32161652	ci: fixed pr test builds for buildkit	2021-05-21 22:24:31 -05:00
itzg	38eb769c1b	docs: Auto update markdown TOC	2021-05-22 03:12:47 +00:00
Geoff Bourne	5e372ed9f4	docs: added java11 tag to README	2021-05-21 22:12:29 -05:00
Geoff Bourne	e027a81317	ci: add java11 to build/merge	2021-05-21 22:05:59 -05:00
itzg	0a51713bd7	docs: Auto update markdown TOC	2021-05-22 03:05:38 +00:00
FW	d5cde03db1	Update Mohist URLs (#887 )	2021-05-21 22:05:22 -05:00
Geoff Bourne	4c3a329e31	ci: adjusted CACHE_NAME	2021-05-21 17:34:05 -05:00
Geoff Bourne	6c94e49732	ci: updated java11 Dockerfile	2021-05-21 17:33:26 -05:00
Geoff Bourne	af77b29509	ci: add java11 to build/merge	2021-05-21 17:32:38 -05:00
Geoff Bourne	449f2bfa09	ci: adjusted multiarch build for java8-multiarch	2021-05-21 17:28:25 -05:00
Geoff Bourne	c9815e2ccb	ci: use CACHE_NAME in main.yml	2021-05-21 17:20:35 -05:00
itzg	9bd6bc64b0	docs: Auto update markdown TOC	2021-05-21 22:01:17 +00:00
Geoff Bourne	a5fe016854	docs: added edge tag to image versions section	2021-05-21 17:00:58 -05:00
itzg	93cd299c77	docs: Auto update markdown TOC	2021-05-21 21:59:13 +00:00
Geoff Bourne	e8f8d8b4d4	ci: introduced CACHE_NAME	2021-05-21 16:58:52 -05:00
Geoff Bourne	b806ea6871	docs: adoptopenjdk:16-openj9 is only available on amd64 #885	2021-05-21 16:53:22 -05:00
Geoff Bourne	cb17180dea	ci: updated build action for java16-openj9 #885	2021-05-21 16:45:33 -05:00
Geoff Bourne	78ec4ba2a7	ci: multiarch build reference master branch	2021-05-21 07:59:04 -05:00
Geoff Bourne	317104de30	ci: fixed multiarch 'master' branch trigger	2021-05-21 07:46:58 -05:00
itzg	63412975c3	docs: Auto update markdown TOC	2021-05-21 12:45:51 +00:00
Geoff Bourne	9c87f8749d	docs: updated README for latest=16	2021-05-21 07:40:46 -05:00
Geoff Bourne	5fc36516f4	ci: switch 'latest/master' build to multiarch	2021-05-21 07:39:59 -05:00
Geoff Bourne	c608c8a57e	Merge branch 'master' into java16	2021-05-21 07:31:12 -05:00
Geoff Bourne	853a9884d7	ci: force apk update	2021-05-21 06:57:19 -05:00
Geoff Bourne	ecafaf4ea1	ci: force rebuild of latest	2021-05-21 06:51:17 -05:00
Geoff Bourne	eb490e92c3	ci: force rebuild of latest	2021-05-21 06:50:04 -05:00
Geoff Bourne	98c7e43927	ci: prefixed TOC commit message	2021-05-19 20:47:48 -05:00