ci: test java8 with VERSION=1.16.5

Auto merge branch with master
Auto-merging via docker-versions-create
2026-02-17 15:13:55 +00:00 · 2021-06-20 13:49:02 -05:00 · 2021-06-20 12:46:28 -05:00 · 2021-06-20 12:46:25 -05:00 · 2021-06-05 17:49:30 -05:00 · 2021-05-27 08:22:17 -05:00
53 changed files with 592 additions and 912 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,5 +0,0 @@
-
-#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-custom:
-  - https://www.buymeacoffee.com/itzg
-  - https://paypal.me/itzg
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -8,7 +8,7 @@ on:
      - java8-openj9
      - java11*
      - java16*
-      - test/*
+      - test/multiarch/*
    tags:
      - "[0-9]+.[0-9]+.[0-9]+"
      - "[0-9]+.[0-9]+.[0-9]+-multiarch*"
@@ -23,8 +23,9 @@ on:

 jobs:
  docker-buildx:
-    if: github.repository == 'itzg/docker-minecraft-server'
    runs-on: ubuntu-20.04
+    env:
+      CACHE_NAME: master
    steps:
      - name: Checkout
        uses: actions/checkout@v2.3.4
@@ -38,8 +39,9 @@ jobs:
          tags: |
            type=ref,event=branch
            type=ref,event=tag
+            type=edge,branch=master
          flavor: |
-            latest=${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+            latest=false

      - name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v1
@@ -48,8 +50,9 @@ jobs:
        uses: actions/cache@v2.1.6
        with:
          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
          restore-keys: |
+            ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-
            ${{ runner.os }}-buildx-

      - name: Set up QEMU
@@ -63,7 +66,7 @@ jobs:

      - name: Build and push
        id: docker_build
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.5.0
        with:
          context: .
          platforms: linux/amd64,linux/arm/v7,linux/arm64
@@ -72,16 +75,8 @@ jobs:
          # ensure latest base image is used
          pull: true
          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+          cache-to: type=local,dest=/tmp/.buildx-cache
          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,7 +7,6 @@ on:
      - README.md
 jobs:
  generate:
-    if: github.repository == 'itzg/docker-minecraft-server'
    runs-on: ubuntu-latest
    timeout-minutes: 5
    steps:
@@ -16,6 +15,6 @@ jobs:
          curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc
          chmod a+x gh-md-toc
          ./gh-md-toc --insert --no-backup README.md
-      - uses: stefanzweifel/git-auto-commit-action@v4.12.0
+      - uses: stefanzweifel/git-auto-commit-action@v4.11.0
        with:
          commit_message: "docs: Auto update markdown TOC"
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ on:
      - openj9
      - openj9-11
      - adopt11
-      - test/alpine/*
+      - test/*
    tags:
      - "[0-9]+.[0-9]+.[0-9]+-java8"
      - "[0-9]+.[0-9]+.[0-9]+-openj9"
@@ -29,6 +29,8 @@ jobs:
    needs:
      - test
    runs-on: ubuntu-20.04
+    env:
+      CACHE_NAME: master

    steps:
    - uses: actions/checkout@v2.3.4
@@ -49,7 +51,9 @@ 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
@@ -58,8 +62,9 @@ jobs:
      uses: actions/cache@v2.1.6
      with:
        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }}
        restore-keys: |
+          ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-
          ${{ runner.os }}-buildx-

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

    - name: Build and push
      id: docker_build
-      uses: docker/build-push-action@v2.7.0
+      uses: docker/build-push-action@v2.5.0
      with:
        context: .
        file: ./Dockerfile
@@ -81,7 +86,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-new
+        cache-to: type=local,dest=/tmp/.buildx-cache
        labels: |
          org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
          org.opencontainers.image.version=${{ steps.prep.outputs.version }}
@@ -90,11 +95,3 @@ 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/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -3,7 +3,7 @@
 Adding a new server `TYPE` can vary due to the complexity of obtaining and configuring each type; however, the addition of any server type includes at least the following steps:

 1. Copy an existing "start-deploy*" script, such as [start-deployMohist](start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix
-2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-setupWorld` at the end of the script 
+2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-finalSetupWorld` at the end of the script 
 3. Develop and test the changes using the [iterative process described below](#iterative-script-development)
 4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](start-configuration)
 5. Add a section to the [README](README.md). It is recommended to copy-modify an existing section to retain a similar wording and level of detail
@@ -70,5 +70,5 @@ The multiarch images are built and published by [a Github action](https://github
 The following git command can be used to provide the bulk of release notes content:

 ```shell script
-git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --pretty="- %s" 1.1.0..1.2.0
+git log --invert-grep --grep "^ci:" --grep "^misc:" --grep "^docs:" --grep "^build(deps)" --pretty="- %s" 1.1.0..1.2.0
 ```
--- a/61
+++ b/61
@@ -1,30 +1,29 @@
-FROM adoptopenjdk:11-jre
+FROM openjdk:8u212-jre-alpine

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

-RUN apt-get update \
-  && DEBIAN_FRONTEND=noninteractive \
-  apt-get install -y \
+RUN apk add --no-cache -U \
+  openssl \
    imagemagick \
-    gosu \
-    sudo \
-    net-tools \
-    iputils-ping \
-    curl wget \
+  lsof \
+  su-exec \
+  shadow \
+  bash \
+  curl iputils wget \
    git \
    jq \
-    dos2unix \
    mysql-client \
    tzdata \
    rsync \
    nano \
-    unzip \
-    knockd \
-    ttf-dejavu \
-    && apt-get clean
+  sudo \
+  knock \
+  ttf-dejavu

-RUN addgroup --gid 1000 minecraft \
-  && adduser --system --shell /bin/false --uid 1000 --ingroup minecraft --home /data minecraft
+RUN addgroup -g 1000 minecraft \
+  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
+  && mkdir -m 777 /data \
+  && chown minecraft:minecraft /data /home/minecraft

 COPY files/sudoers* /etc/sudoers.d

@@ -32,9 +31,9 @@ EXPOSE 25565 25575

 # hook into docker BuildKit --platform support
 # see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
+ARG TARGETOS=linux
+ARG TARGETARCH=amd64
+ARG TARGETVARIANT=""

 ARG EASY_ADD_VER=0.7.1
 ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
@@ -45,25 +44,22 @@ 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.1 --var app=rcon-cli --file {{.app}} \
+ --var version=1.4.7 --var app=rcon-cli --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} \
- --var version=0.10.1 --var app=mc-monitor --file {{.app}} \
+ --var version=0.7.1 --var app=mc-monitor --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} \
- --var version=1.8.0 --var app=mc-server-runner --file {{.app}} \
+ --var version=1.5.0 --var app=mc-server-runner --file {{.app}} \
 --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
 --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
 --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

-ARG MC_HELPER_VERSION=1.6.1
-RUN curl -fsSL https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
-    | tar -C /usr/share -zxf - \
-    && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
+COPY mcstatus /usr/local/bin

 VOLUME ["/data"]
 COPY server.properties /tmp/server.properties
@@ -73,7 +69,7 @@ WORKDIR /data
 STOPSIGNAL SIGTERM

 ENV UID=1000 GID=1000 \
-  MEMORY="1G" \
+  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
  TYPE=VANILLA VERSION=LATEST \
  ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
  SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
@@ -81,13 +77,12 @@ ENV UID=1000 GID=1000 \
  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0

 COPY start* /
-COPY bin/ /usr/local/bin/
-COPY bin/mc-health /health.sh
-
+COPY health.sh /
 ADD files/autopause /autopause

-RUN dos2unix /start* && chmod +x /start* \
-    && dos2unix /autopause/* && chmod +x /autopause/*.sh
+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 mc-health
+HEALTHCHECK --start-period=1m CMD /health.sh
--- a/README.md
+++ b/README.md
@@ -13,11 +13,30 @@ To simply use the latest stable version, run

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

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

-> If you plan on running a server for a longer amount of time it is highly recommended using a management layer such as [Docker Compose](#using-docker-compose) or [Kubernetes](#deployment-templates-and-examples) to allow for incremental reconfiguration and image upgrades.
+If you want to serve up multiple Minecraft servers or just use an alternate port,
+change the host-side port mapping such as

-> Be sure to always include `-e EULA=TRUE` in your commands and container definitions, as Mojang/Microsoft requires EULA acceptance.
+    ... -p 25566:25565 ...
+
+will serve your Minecraft server on your host's port 25566 since the `-p` syntax is
+`host-port`:`container-port`.
+
+Speaking of multiple servers, it's handy to give your containers explicit names using `--name`, such as naming this one "mc"
+
+    ... --name mc itzg/minecraft-server
+
+With that you can easily view the logs, stop, or re-start the container:
+
+    docker logs -f mc
+        ( Ctrl-C to exit logs action )
+
+    docker stop mc
+
+    docker start mc
+
+> Be sure to always include `-e EULA=TRUE` in your commands, as Mojang/Microsoft requires EULA acceptance.

 By default, the container will download the latest version of the "vanilla" [Minecraft: Java Edition server](https://www.minecraft.net/en-us/download/server) provided by Mojang. The [`VERSION`](#versions) and the [`TYPE`](#server-types) can be configured to create many variations of desired Minecraft server. 

@@ -38,27 +57,27 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [Examples](#examples)
      * [Amazon Web Services (AWS) Deployment](#amazon-web-services-aws-deployment)
      * [Using Docker Compose](#using-docker-compose)
-   * [Troubleshooting](#troubleshooting)
   * [Server types](#server-types)
      * [Running a Forge Server](#running-a-forge-server)
      * [Running a Bukkit/Spigot server](#running-a-bukkitspigot-server)
      * [Running a Paper server](#running-a-paper-server)
+      * [Running a Tuinity server](#running-a-tuinity-server)
      * [Running an Airplane server](#running-an-airplane-server)
      * [Running a Purpur server](#running-a-purpur-server)
+      * [Running a Yatopia server](#running-a-yatopia-server)
      * [Running a Magma server](#running-a-magma-server)
      * [Running a Mohist server](#running-a-mohist-server)
      * [Running a Catserver type server](#running-a-catserver-type-server)
      * [Running an Canyon server](#running-an-canyon-server)
      * [Running a SpongeVanilla server](#running-a-spongevanilla-server)
      * [Running a Fabric Server](#running-a-fabric-server)
-      * [Running a Limbo server](#running-a-limbo-server)
   * [Running a server with a Feed the Beast modpack](#running-a-server-with-a-feed-the-beast-modpack)
      * [Environment Variables:](#environment-variables)
      * [Upgrading](#upgrading)
      * [Example](#example)
   * [Running a server with a CurseForge modpack](#running-a-server-with-a-curseforge-modpack)
-      * [Modpack data directory](#modpack-data-directory)
-      * [Buggy start scripts](#buggy-start-scripts)
+         * [Modpack data directory](#modpack-data-directory)
+         * [Buggy start scripts](#buggy-start-scripts)
      * [Fixing "unable to launch forgemodloader"](#fixing-unable-to-launch-forgemodloader)
   * [Working with mods and plugins](#working-with-mods-and-plugins)
      * [Optional plugins, mods, and config attach points](#optional-plugins-mods-and-config-attach-points)
@@ -70,7 +89,8 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [Cloning world from a container path](#cloning-world-from-a-container-path)
      * [Overwrite world on start](#overwrite-world-on-start)
   * [Server configuration](#server-configuration)
-      * [Message of the Day](#message-of-the-day)
+      * [Server name](#server-name)
+      * [Server port](#server-port)
      * [Difficulty](#difficulty)
      * [Whitelist Players](#whitelist-players)
      * [Op/Administrator Players](#opadministrator-players)
@@ -95,41 +115,37 @@ By default, the container will download the latest version of the "vanilla" [Min
      * [View Distance](#view-distance)
      * [Level Seed](#level-seed)
      * [Game Mode](#game-mode)
+      * [Message of the Day](#message-of-the-day)
      * [PVP Mode](#pvp-mode)
      * [Level Type and Generator Settings](#level-type-and-generator-settings)
      * [Custom Server Resource Pack](#custom-server-resource-pack)
-      * [Level / World Save Name](#level--world-save-name)
+      * [World Save Name](#world-save-name)
      * [Online mode](#online-mode)
      * [Allow flight](#allow-flight)
-      * [Server name](#server-name)
-      * [Server port](#server-port)
      * [Other server property mappings](#other-server-property-mappings)
   * [Miscellaneous Options](#miscellaneous-options)
      * [Replacing variables inside configs](#replacing-variables-inside-configs)
-      * [Patching existing files](#patching-existing-files)
      * [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)
+   * [Timezone Configuration](#timezone-configuration)
      * [Enable Remote JMX for Profiling](#enable-remote-jmx-for-profiling)
      * [Enable Aikar's Flags](#enable-aikars-flags)
      * [HTTP Proxy](#http-proxy)
      * [Using "noconsole" option](#using-noconsole-option)
      * [Explicitly disable GUI](#explicitly-disable-gui)
      * [Stop Duration](#stop-duration)
-      * [Setup only](#setup-only)
   * [Autopause](#autopause)
      * [Description](#description)
      * [Enabling Autopause](#enabling-autopause)
   * [Running on RaspberryPi](#running-on-raspberrypi)

-<!-- Added by: runner, at: Sat Oct  9 16:34:51 UTC 2021 -->
+<!-- Added by: runner, at: Wed Jun  9 12:35:18 UTC 2021 -->

 <!--te-->

@@ -151,7 +167,8 @@ docker exec -i mc rcon-cli

 Note: The `-i` is required for interactive use of rcon-cli.

-To run a simple, one-shot command, such as stopping a Minecraft server, pass the command as arguments to `rcon-cli`, such as:
+To run a simple, one-shot command, such as stopping a Minecraft server, pass the command as
+arguments to `rcon-cli`, such as:

 ```
 docker exec mc rcon-cli stop
@@ -159,14 +176,6 @@ docker exec mc rcon-cli stop

 _The `-i` is not needed in this case._

-If rcon is disabled you can send commands by passing them as arguments to the packaged `mc-send-to-console` script. For example, a player can be op'ed in the container `mc` with: 
-
-```shell
-docker exec mc mc-send-to-console op player
-            |                     |
-            +- container name     +- Minecraft commands start here
-```
-
 In order to attach and interact with the Minecraft server, add `-it` when starting the container, such as

    docker run -d -it -p 25565:25565 --name mc itzg/minecraft-server
@@ -203,7 +212,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"
+version: "3.8"

 services:
  mc:
@@ -212,9 +221,6 @@ 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
@@ -243,7 +249,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 (case sensitive), which can have the value
+To use a different Minecraft version, pass the `VERSION` environment variable, which can have the value

 - LATEST (the default)
 - SNAPSHOT
@@ -278,9 +284,9 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
 | multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |

-For example, to use Java version 16 on any supported architecture:
+For example, to use Java version 15 on any supported architecture:

-    docker run --name mc itzg/minecraft-server:java16
+    docker run --name mc itzg/minecraft-server:java15

 > Keep in mind that some versions of Minecraft server can't work on the newest versions of Java. Also, FORGE doesn't support openj9 JVM implementation.

@@ -337,18 +343,20 @@ every time you want to create new Minecraft server, you can now use
 `docker-compose.yml` file like the following:

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

-services:
-  mc:
-    image: itzg/minecraft-server
-    ports:
-      - 25565:25565
-    environment:
-      EULA: "TRUE"
-    tty: true
-    stdin_open: true
-    restart: unless-stopped
+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
@@ -358,14 +366,6 @@ and in the same directory as that file run
 Now, go play...or adjust the `environment` section to configure
 this server instance.

-## Troubleshooting
-
-To troubleshoot the container initialization, such as when server files are pre-downloaded, set the environment variable `DEBUG` to `true`. The container logs will include **much more** output, and it is highly recommended including that output when reporting any [issues](https://github.com/itzg/docker-minecraft-server/issues).
-
-To troubleshoot just the command-line used to start the Minecraft server, set the environment variable `DEBUG_EXEC` to `true`.
-
-To troubleshoot any issues with memory allocation reported by the JVM, set the environment variable `DEBUG_MEMORY` to `true`.
-
 ## Server types

 ### Running a Forge Server
@@ -436,22 +436,29 @@ If you have attached a host directory to the `/data` volume, then you can instal

 [You can also auto-download plugins using `SPIGET_RESOURCES`.](#auto-downloading-spigotmcbukkitpapermc-plugins)

+### Running a Tuinity server
+
+A [Tuinity](https://github.com/Spottedleaf/Tuinity) server, which is a fork of Paper aimed at improving server performance at high playercounts.
+
+    -e TYPE=TUINITY
+
+> **NOTE** only `VERSION=LATEST` is supported
+
 ### Running an Airplane server

-An [Airplane](https://airplane.gg) server, which is "a stable, optimized, well supported 1.17 Paper fork."
+An [Airplane](https://github.com/TECHNOVE/Airplane) server, which is a fork of Tuinity aimed at further improving server performance at high playercounts.

    -e TYPE=AIRPLANE

-> 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"
+> **NOTE** only `VERSION=LATEST` is supported

 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 "drop-in replacement for Paper servers designed for configurability, new fun and exciting gameplay features, and performance built on top of Airplane."
+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

@@ -460,6 +467,18 @@ A [Purpur](https://purpur.pl3x.net/) server, which is "drop-in replacement for P
 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
+
+### Running a Yatopia server
+
+A [Yatopia](https://github.com/YatopiaMC/Yatopia) server, which is a "blazing fast Tuinity fork with best in class performance".
+
+    -e TYPE=YATOPIA
+
+> NOTE: the `VERSION` variable is used to locate the Yatopia version to download
+
+Extra variables:
+- `RELEASE=stable` : set to `stable` or `latest`
+- `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 Magma server
@@ -468,9 +487,7 @@ A [Magma](https://magmafoundation.org/) server, which is a combination of Forge

    -e TYPE=MAGMA

-By default, the "stable" channel is used, but you can set `MAGMA_CHANNEL` to "dev" to access dev channel versions.
-
-> **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2", "1.16.5", etc.
+> **NOTE** there are limited base versions supported, so you will also need to  set `VERSION`, such as "1.12.2"


 ### Running a Mohist server
@@ -550,20 +567,6 @@ docker run -d -v /path/on/host:/data ... \

 In order to add mods, you have two options:

-### Running a Limbo server
-
-A [Limbo](https://github.com/LOOHP/Limbo) server can be run by setting `TYPE` to `LIMBO`.
-
-Configuration options with defaults:
-
- `LIMBO_BUILD`=LATEST
-
-  The `VERSION` will be ignored so locate the appropriate value from [here](https://ci.loohpjames.com/job/Limbo/) to match the version expected by clients.
-
- `FORCE_REDOWNLOAD`=false
- `LIMBO_SCHEMA_FILENAME`=default.schem
- `LEVEL`="Default;${LIMBO_SCHEMA_FILENAME}"
-
 ## Running a server with a Feed the Beast modpack

 > **NOTE** requires one of the Debian based images listed in [the Java versions section](#running-minecraft-server-on-different-java-version).
@@ -615,13 +618,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`.

@@ -642,20 +645,20 @@ then you apply a workaround by adding this to the run invocation:
 There are optional volume paths that can be attached to supply content to be copied into the data area:

 `/plugins`
-: contents are synchronized into `/data/plugins` for Bukkit related server types. Set `SYNC_SKIP_NEWER_IN_DESTINATION=false` if you want files from `/plugins` to take precedence over newer files in `/data/plugins`.
+: contents are copied into `/data/plugins` for Bukkit related server types. Set `PLUGINS_SYNC_UPDATE=false` if you want files from `/plugins` to take precedence over newer files in `/data/plugins`.

 `/mods`
-: contents are synchronized into `/data/mods` for Forge related server types. The destination can be changed by setting `COPY_MODS_DEST`.
+: contents are copied into `/data/mods` for Forge related server types

 `/config`
-: contents are synchronized into `/data/config` by default, but can be changed with `COPY_CONFIG_DEST`. For example, `-v ./config:/config -e COPY_CONFIG_DEST=/data` will allow you to copy over files like `bukkit.yml` and so on directly into the server directory. Set `SYNC_SKIP_NEWER_IN_DESTINATION=false` if you want files from `/config` to take precedence over newer files in `/data/config`.
-
-By default, the [environment variable processing](#replacing-variables-inside-configs) is performed on synchronized files that match the expected suffixes in `REPLACE_ENV_SUFFIXES` (by default "yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml") and are not excluded by `REPLACE_ENV_VARIABLES_EXCLUDES` and `REPLACE_ENV_VARIABLES_EXCLUDE_PATHS`. This processing can be disabled by setting `REPLACE_ENV_DURING_SYNC` to `false`.
+: contents are copied into `/data/config` by default, but can be changed with `COPY_CONFIG_DEST`

 If you want old mods/plugins to be removed before the content is brought over from those attach points, then add `-e REMOVE_OLD_MODS=TRUE`. You can fine tune the removal process by specifying the `REMOVE_OLD_MODS_INCLUDE` and `REMOVE_OLD_MODS_EXCLUDE` variables. By default, everything will be removed. You can also specify the `REMOVE_OLD_MODS_DEPTH` (default is 16) variable to only delete files up to a certain level.

 For example: `-e REMOVE_OLD_MODS=TRUE -e REMOVE_OLD_MODS_INCLUDE="*.jar" -e REMOVE_OLD_MODS_DEPTH=1` will remove all old jar files that are directly inside the `plugins/` or `mods/` directory.

+You can specify the destination of the files that are copied from `/mods` and `/config` by setting the `COPY_MODS_DEST` and `COPY_CONFIG_DEST`, where the default is `/data/mods` and `/data/config`. For example, `-v ./config:/config -e COPY_CONFIG_DEST=/data` will allow you to copy over files like `bukkit.yml` and so on directly into the server directory.
+
 These paths work well if you want to have a common set of modules in a separate location, but still have multiple worlds with different server requirements in either persistent volumes or a downloadable archive.

 > 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)
@@ -732,10 +735,6 @@ read-only volume attachment to ensure the clone source remains pristine.
 docker run ... -v $HOME/worlds:/worlds:ro -e WORLD=/worlds/basic
 ```

-The following diagram shows how this option can be used in a compose deployment with a relative directory:
-
-![](docs/world-copy-compose-project.drawio.png)
-
 ### 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.

@@ -754,25 +753,21 @@ This will reset any manual configuration of the `server.properties` file, so if
 you want to make any persistent configuration changes you will need to make sure
 you have properly set the proper environment variables in your docker run command (described below).

-### Message of the Day
+### Server name

-The message of the day, shown below each server entry in the client UI, can be changed with the `MOTD` environment variable, such as
+The server name (e.g. for bungeecord) can be set like:

-    -e MOTD="My Server"
+    docker run -d -e SERVER_NAME=MyServer ...

-If you leave it off, a default is computed from the server type and version, such as
+### Server port

-    A Paper Minecraft Server powered by Docker
+> **WARNING:** only change this value if you know what you're doing. It is only needed when using host networking and it is rare that host networking should be used. Use `-p` port mappings instead.

-That way you can easily differentiate between several servers you may have started.
+If you must, the server port can be set like:

-The section symbol (§) and other unicode characters are automatically converted to allow [formatting codes](https://minecraft.fandom.com/wiki/Formatting_codes) to be used consistently with all server versions. For example,
+    docker run -d -e SERVER_PORT=25566 ...

-     -e MOTD="A §l§cMinecraft§r §nserver"
-
-renders
-
-![](docs/motd-example.png)
+**however**, be sure to change your port mapping accordingly and be prepared for some features to break.

 ### Difficulty

@@ -786,19 +781,16 @@ values.

 ### Whitelist Players

-> **NOTE** it is very important to set this with servers exposed to the internet where you want only limited players to join.
-
 To whitelist players for your Minecraft server, pass the Minecraft usernames separated by commas via the `WHITELIST` environment variable, such as

    docker run -d -e WHITELIST=user1,user2 ...

 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 properties `white-list` and `whitelist` will automatically get set to `true`.
+> NOTE: When `WHITELIST` is used the server property `white-list` 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
@@ -820,7 +812,7 @@ The server icon which has been set doesn't get overridden by default. It can be

 ### Rcon

-To use rcon use the `ENABLE_RCON` and `RCON_PASSWORD` variables.
+To use rcon use the `ENABLE_RCON` and `RCON_PASSORD` variables.
 By default rcon port will be `25575` but can easily be changed with the `RCON_PORT` variable.

    docker run -d -e ENABLE_RCON=true -e RCON_PASSWORD=testing
@@ -963,6 +955,18 @@ For example:

    docker run -d -e MODE=creative ...

+### Message of the Day
+
+The message of the day, shown below each server entry in the UI, can be changed with the `MOTD` environment variable, such as
+
+    -e MOTD="My Server"
+
+If you leave it off, a default is computed from the server type and version, such as
+
+    A Paper Minecraft Server powered by Docker
+
+That way you can easily differentiate between several servers you may have started.
+
 ### PVP Mode

 By default, servers are created with player-vs-player (PVP) mode enabled. You can disable this with the `PVP`
@@ -994,10 +998,6 @@ 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":{}}}'
-
 ### Custom Server Resource Pack

 You can set a link to a custom resource pack and set it's checksum using the `RESOURCE_PACK` and `RESOURCE_PACK_SHA1` options respectively, the default is blank:
@@ -1006,18 +1006,16 @@ 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.

-### Level / World Save Name
+### 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.

-> **INFO** Refer to the [data directory](#data-directory) section for a visual description of where the `$LEVEL` directory is situated.
-
 ### Online mode

 By default, server checks connecting players against Minecraft's account database. If you want to create an offline server or your server is not connected to the internet, you can disable the server to try connecting to minecraft.net to authenticate players with environment variable `ONLINE_MODE`, like this
@@ -1030,22 +1028,6 @@ Allows users to use flight on your server while in Survival mode, if they have a

    -e ALLOW_FLIGHT=TRUE|FALSE

-### Server name
-
-The server name (e.g. for bungeecord) can be set like:
-
-    docker run -d -e SERVER_NAME=MyServer ...
-
-### Server port
-
-> **WARNING:** only change this value if you know what you're doing. It is only needed when using host networking and it is rare that host networking should be used. Use `-p` port mappings instead.
-
-If you must, the server port can be set like:
-
-    docker run -d -e SERVER_PORT=25566 ...
-
-**however**, be sure to change your port mapping accordingly and be prepared for some features to break.
-
 ### Other server property mappings

 | Environment Variable              | Server Property                   |
@@ -1063,8 +1045,6 @@ If you must, the server port can be set like:
 | PREVENT_PROXY_CONNECTIONS         | prevent-proxy-connections         |
 | USE_NATIVE_TRANSPORT              | use-native-transport              |
 | ENFORCE_WHITELIST                 | enforce-whitelist                 |
-| ENABLE_WHITELIST                  | white-list and whitelist          |
-| SIMULATION_DISTANCE               | simulation-distance               |

 ## Miscellaneous Options

@@ -1079,13 +1059,24 @@ 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.

-When the environment variable `REPLACE_ENV_IN_PLACE` is set to `true` (the default), the startup script will go through all files inside the container's `/data` path and replace variables that match the container's environment variables. Variables can instead (or in addition to) be replaced in files sync'ed from `/plugins`, `/mods`, and `/config` by setting `REPLACE_ENV_DURING_SYNC` to `true` (defaults to `false`). 
+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.

-Variables that you want to replace need to be declared inside curly brackets and prefixed with a dollar sign, such as  `${CFG_YOUR_VARIABLE}`, which is same as many scripting languages.
+Optionally you can also define a prefix to only match predefined environment variables.

-You can also change `REPLACE_ENV_VARIABLE_PREFIX`, which defaults to "CFG_", to limit which environment variables are allowed to be used. For example, with "CFG_" as the prefix, the variable `${CFG_DB_HOST}` would be subsituted, but not `${DB_HOST}`.
+`ENV_VARIABLE_PREFIX="CFG_"` <-- this is the default prefix

-If you want to use a file for value (like when use secrets) you can add suffix `_FILE` to your variable name.
+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`.
@@ -1135,6 +1126,14 @@ services:
      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:
@@ -1145,47 +1144,9 @@ secrets:
    file: ./db_password
 ```

-### Patching existing files
+The content of `db_password`:

-JSON path based patches can be applied to one or more existing files by setting the variable `PATCH_DEFINITIONS` to the path of a directory that contains one or more [patch definition json files](https://github.com/itzg/mc-image-helper#patchdefinition) or a [patch set json file](https://github.com/itzg/mc-image-helper#patchset).
-
-Variable placeholders in the patch values can be restricted by setting `REPLACE_ENV_VARIABLE_PREFIX`, which defaults to "CFG_".
-
-The following example shows a patch-set file were various fields in the `paper.yaml` configuration file can be modified and added:
-
-```json
-{
-  "patches": [
-    {
-      "file": "/data/paper.yml",
-      "ops": [
-        {
-          "$set": {
-            "path": "$.verbose",
-            "value": true
-          }
-        },
-        {
-          "$set": {
-            "path": "$.settings['velocity-support'].enabled",
-            "value": "${CFG_VELOCITY_ENABLED}",
-            "value-type": "bool"
-          }
-        },
-        {
-          "$put": {
-            "path": "$.settings",
-            "key": "my-test-setting",
-            "value": "testing"
-          }
-        }
-      ]
-    }
-  ]
-}
-```
-
-> **NOTES:** Only JSON and Yaml files can be patched at this time. TOML support is planned to be added next. Removal of comments and other cosmetic changes will occur when patched files are processed.
+    ug23u3bg39o-ogADSs

 ### Running with a custom server JAR

@@ -1246,25 +1207,13 @@ 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 `docker attach` to the Minecraft server console with color and interactive capabilities, then add
+If you would like to attach to the Minecraft server console with color and interactive capabilities, then add

 ```
  -e EXEC_DIRECTLY=true
 ```

-> **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/).
+> **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.

 ### OpenJ9 Specific Options

@@ -1285,7 +1234,7 @@ By default the vanilla log file will grow without limit. The logger can be recon

 > **NOTE** this will interfere with interactive/color consoles [as described in the section above](#interactive-and-color-console)

-### Timezone Configuration
+## Timezone Configuration

 You can configure the timezone to match yours by setting the `TZ` environment variable:

@@ -1342,11 +1291,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 default it waits 60 seconds, but that duration can be configured by setting the environment variable `STOP_DURATION` to the number of seconds.
-
-### Setup only
-
-If you are using a host-attached data directory, then you can have the image setup the Minecraft server files and stop prior to launching the server process by setting `SETUP_ONLY` to `true`. 
+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.

 ## Autopause

@@ -1360,7 +1305,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. 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`
+> **NOTE:** Non-vanilla versions might have their own configuration file, you might have to disable their watchdogs separately (e.g. PAPER Servers).

 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.

--- a/bin/mc-send-to-console
+++ b/bin/mc-send-to-console
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-: "${CONSOLE_IN_NAMED_PIPE:=/tmp/minecraft-console-in}"
-
-if [ $# = 0 ]; then
-  echo "ERROR: pass console commands as arguments"
-  exit 1
-fi
-
-if [ ! -p "${CONSOLE_IN_NAMED_PIPE}" ]; then
-  echo "ERROR: named pipe ${CONSOLE_IN_NAMED_PIPE} is missing"
-  exit 1
-fi
-
-echo "$@" > "${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}"
--- a/docs/motd-example.png
+++ b/docs/motd-example.png
--- a/examples/docker-compose-autopause.yml
+++ b/examples/docker-compose-autopause.yml
@@ -12,10 +12,7 @@ services:
      ENABLE_AUTOPAUSE: "TRUE"
      OVERRIDE_SERVER_PROPERTIES: "TRUE"
      MAX_TICK_TIME: "-1"
-      # More aggressive settings for demo purposes
-      AUTOPAUSE_TIMEOUT_INIT: "30"
-      AUTOPAUSE_TIMEOUT_EST: "10"
-    restart: unless-stopped
+    restart: always

 volumes:
  mc: {}
--- a/examples/docker-compose-fabric.yml
+++ b/examples/docker-compose-fabric.yml
@@ -1,15 +0,0 @@
-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-rlcraft.yml
+++ b/examples/docker-compose-rlcraft.yml
@@ -1,27 +0,0 @@
-version: '3.8'
-
-services:
-  rlcraft:
-    image: itzg/minecraft-server:java8
-    container_name: rlcraft
-    volumes:
-    - rlcraft-modpack:/modpacks:ro
-    - rlcraft-data:/data
-    environment:
-      EULA: "true"
-      TYPE: "FORGE"
-      VERSION: "1.12.2"
-      FORGEVERSION: "14.23.5.2855"
-      DIFFICULTY: "hard"
-      MAX_TICK_TIME: "-1"
-      VIEW_DISTANCE: "6"
-      ALLOW_FLIGHT: "true"
-      MEMORY: "4G"
-      GENERIC_PACK: "/modpacks/RLCraft_Server_Pack_1.12.2_Beta_v2.8.2.zip"
-    ports:
-      - 25565:25565
-    restart: unless-stopped
-
-volumes:
-  rlcraft-data:
-  rlcraft-modpack:
--- a/examples/docker-compose-spiget.yml
+++ b/examples/docker-compose-spiget.yml
@@ -1,17 +0,0 @@
-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/files/autopause/autopause-daemon.sh
+++ b/files/autopause/autopause-daemon.sh
--- a/files/autopause/autopause-fcns.sh
+++ b/files/autopause/autopause-fcns.sh
@@ -5,27 +5,38 @@ current_uptime() {
 }

 java_running() {
-  [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
+  [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
 }

 java_process_exists() {
-  [[ -n "$(ps -ax -o comm | grep 'java')" ]]
+  [[ -n "$(ps -a -o comm | grep 'java')" ]]
 }

 rcon_client_exists() {
-  [[ -n "$(ps -ax -o comm | grep 'rcon-cli')" ]]
+  [[ -n "$(ps -a -o comm | grep 'rcon-cli')" ]]
 }

 mc_server_listening() {
-  mc-monitor status --host localhost --port $SERVER_PORT --timeout 10s >& /dev/null
+  [[ -n $(netstat -tln | grep -e "0.0.0.0:$SERVER_PORT" -e ":::$SERVER_PORT" | grep LISTEN) ]]
 }

 java_clients_connected() {
  local connections
-  if java_running ; then
-    connections=$(mc-monitor status --host localhost --port $SERVER_PORT --show-player-count)
-  else
-    connections=0
+  connections=$(netstat -tn | grep ":$SERVER_PORT" | grep ESTABLISHED)
+  if [[ -z "$connections" ]] ; then
+    return 1
  fi
-  (( $connections > 0 ))
+  IFS=$'\n'
+  connections=($connections)
+  unset IFS
+  # check that at least one external address is not localhost
+  # remember, that the host network mode does not work with autopause because of the knockd utility
+  for (( i=0; i<${#connections[@]}; i++ ))
+  do
+    if [[ ! $(echo "${connections[$i]}" | awk '{print $5}') =~ ^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$ ]] ; then
+      # not localhost
+      return 0
+    fi
+  done
+  return 1
 }
--- a/files/autopause/knockd-config.cfg
+++ b/files/autopause/knockd-config.cfg
@@ -3,13 +3,10 @@
 [unpauseMCServer-server]
 sequence = 25565
 seq_timeout = 1
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
 tcpflags = syn
 [unpauseMCServer-rcon]
 sequence = 25575
 seq_timeout = 1
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
+ command = /sbin/su-exec minecraft:minecraft /autopause/resume.sh
 tcpflags = syn
-[unpauseMCServer-bedrock]
- sequence = 19132:udp
- command = /usr/sbin/gosu minecraft:minecraft /autopause/resume.sh
--- a/files/autopause/pause.sh
+++ b/files/autopause/pause.sh
@@ -2,7 +2,7 @@

 . /start-utils

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

--- a/files/autopause/resume.sh
+++ b/files/autopause/resume.sh
@@ -2,7 +2,7 @@

 . /start-utils

-if [[ $( ps -ax -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
+if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
  logAutopauseAction "Knocked, resuming Java process"
  pkill -CONT java
 fi
--- a/bin/mc-health
+++ b/bin/mc-health
@@ -1,6 +1,5 @@
 #!/bin/bash

-# shellcheck source=../start-utils
 . ${SCRIPTS:-/}start-utils

 if isTrue "${DISABLE_HEALTHCHECK}"; then
--- a/bin/mcstatus
+++ b/bin/mcstatus
--- a/2
+++ b/2
@@ -40,7 +40,7 @@ if ! isTrue "${SKIP_SUDO:-false}" && [ $(id -u) = 0 ]; then
    echo 'hosts: files dns' > /etc/nsswitch.conf
  fi

-  exec gosu ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
+  exec su-exec ${runAsUser}:${runAsGroup} ${SCRIPTS:-/}start-configuration $@
 else
  exec ${SCRIPTS:-/}start-configuration $@
 fi
--- a/55
+++ b/55
@@ -2,17 +2,14 @@
 set -euo pipefail
 IFS=$'\n\t'

-# shellcheck source=start-utils
 . ${SCRIPTS:-/}start-utils

-: "${EULA:=}"
-: "${PROXY:=}"
-: "${RCON_PASSWORD_FILE:=}"
+: ${EULA:=}
+: ${PROXY:=}
+: ${RCON_PASSWORD_FILE:=}

 shopt -s nullglob

-isDebugging && set -x
-
 #umask 002
 export HOME=/data

@@ -59,23 +56,17 @@ fi

 if ! which java > /dev/null; then
  log "Fixing PATH to include java"
-  PATH="${PATH}:/opt/java/openjdk/bin"
+  PATH="${PATH}:/usr/bin"
 fi

 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json

 case "X$VERSION" in
  X|XLATEST|Xlatest)
-    if ! VANILLA_VERSION=$(get --json-path '$.latest.release' "$VERSIONS_JSON"); then
-      log "ERROR: version lookup failed: $VANILLA_VERSION"
-      exit 1
-    fi
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
  ;;
  XSNAPSHOT|Xsnapshot)
-    if ! VANILLA_VERSION=$(get --json-path '$.latest.snapshot' "$VERSIONS_JSON"); then
-      log "ERROR: version lookup failed: $VANILLA_VERSION"
-      exit 1
-    fi
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot')
  ;;
  *)
    VANILLA_VERSION=$VERSION
@@ -102,13 +93,11 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployPaper "$@"
  ;;

+  TUINITY)
+    exec ${SCRIPTS:-/}start-deployTuinity "$@"
+  ;;
+
  FORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;

@@ -116,22 +105,12 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployFabric "$@"
  ;;

-  FTBA)
-    exec ${SCRIPTS:-/}start-deployFTBA "$@"
-  ;;
-
  FTB|CURSEFORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;

  VANILLA)
-    exec "${SCRIPTS:-/}start-deployVanilla" "$@"
+    exec ${SCRIPTS:-/}start-deployVanilla "$@"
  ;;

  SPONGEVANILLA)
@@ -162,6 +141,10 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployPurpur "$@"
  ;;

+  YATOPIA)
+    exec ${SCRIPTS:-/}start-deployYatopia "$@"
+  ;;
+
  AIRPLANE)
    exec ${SCRIPTS:-/}start-deployAirplane "$@"
  ;;
@@ -170,15 +153,11 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployCanyon "$@"
  ;;

-  LIMBO)
-    exec ${SCRIPTS:-/}start-deployLimbo "$@"
-  ;;
-
  *)
      log "Invalid type: '$TYPE'"
      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
-      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM,"
-      log "         MAGMA, MOHIST, CATSERVER, AIRPLANE, CANYON, LIMBO"
+      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, TUINITY, PURPUR"
+      log "         CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA, AIRPLANE, CANYON"
      exit 1
  ;;

--- a/41
+++ b/41
@@ -5,38 +5,23 @@ IFS=$'\n\t'
 . ${SCRIPTS:-/}start-utils
 isDebugging && set -x

-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."
+JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1)
+
+if [ "${JAVA_VER}" = "8" ]; then
+  JDK=8
+else
+  JDK=11
+fi
+
+if [ "${VERSION}" != "LATEST" ]; then
+  log "ERROR: Airplane server type only supports VERSION=LATEST"
  exit 1
 fi

-: ${AIRPLANE_BUILD:=lastSuccessfulBuild}
-: ${AIRPLANE_TYPE:=airplane}
+export SERVER=airplane-${VANILLA_VERSION}-jdk${JDK}.jar

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

  if [[ -z $downloadUrl ]]; then
-    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
+    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
  fi

  setServerVar
--- a/5
+++ b/5
@@ -101,7 +101,7 @@ if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then

  export FTB_DIR=$(dirname "${SERVER}")

-  exec ${SCRIPTS:-/}start-setupWorld $@
+  exec ${SCRIPTS:-/}start-finalSetupWorld $@
 fi

 entryScriptExpr="
@@ -236,4 +236,5 @@ elif [ -e "${FTB_DIR}/Install.sh" ]; then
  popd
 fi

-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/0
+++ b/0
--- a/2
+++ b/2
@@ -29,4 +29,4 @@ fi
 export SKIP_LOG4J_CONFIG=true

 # Continue to Final Setup
-exec ${SCRIPTS:-/}start-setupWorld "$@"
+exec ${SCRIPTS:-/}start-finalSetupWorld "$@"
--- a/3
+++ b/3
@@ -32,4 +32,5 @@ fi

 export SKIP_LOG4J_CONFIG=true

-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/11
+++ b/11
@@ -30,13 +30,7 @@ if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MO
  ftbInstaller=/data/ftb-installer
  if ! [[ -f "${ftbInstaller}" ]]; then
    log "Downloading FTB installer"
-    if [ "$(uname -m)" == "aarch64" ]; then
-      log "Downloading ARM installer"
-      curl -fsSL https://api.modpacks.ch/public/modpack/1/1/server/arm/linux -o "${ftbInstaller}"
-    else
-      log "Downloading x86 installer"
-      curl -fsSL https://api.modpacks.ch/public/modpack/1/1/server/linux -o "${ftbInstaller}"
-    fi
+    curl -fsSL https://api.modpacks.ch/public/modpack/1/1/server/linux -o "${ftbInstaller}"
    chmod +x "${ftbInstaller}"
  fi

@@ -79,4 +73,5 @@ if ! [ -v SERVER ]; then
  exit 2
 fi

-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/77
+++ b/77
@@ -1,46 +1,56 @@
 #!/bin/bash
 set -eu

-# shellcheck source=start-utils
 . ${SCRIPTS:-/}start-utils

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

-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=${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)
      FABRIC_INSTALLER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
-    fi
+      ;;
+  esac

-    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
+  FABRIC_INSTALLER="/tmp/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+  markerVersion=$FABRIC_INSTALLER_VERSION

+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
-    log "Downloading $FABRIC_INSTALLER_URL ..."
-    if ! get -o "$FABRIC_INSTALLER" "$FABRIC_INSTALLER_URL"; then
-      log "Failed to download from given location $FABRIC_INSTALLER_URL"
-      exit 2
+    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
    fi
  fi

-  log "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
-
+  if isDebugging; then
+    debug "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
+  else
+    log "Installing Fabric using $FABRIC_INSTALLER"
+  fi
  tries=3
  set +e
  while ((--tries >= 0)); do
@@ -57,8 +67,13 @@ if [[ ! -e ${SERVER} ]]; 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

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

-exec ${SCRIPTS:-/}start-setupWorld "$@"
+# Contineut to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/160
+++ b/160
@@ -1,39 +1,86 @@
 #!/bin/bash

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

-get_installer() {
-  if [[ -z $FORGE_INSTALLER_URL ]]; then
-    log "Downloading $normForgeVersion"
+if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
+  norm=$VANILLA_VERSION

-    forgeFileNames="
-    $normForgeVersion/forge-$normForgeVersion-installer.jar
-    $shortForgeVersion/forge-$shortForgeVersion-installer.jar
-  "
+  case $VANILLA_VERSION in
+    *.*.*)
+      norm=$VANILLA_VERSION ;;
+    *.*)
+      norm=${VANILLA_VERSION}.0 ;;
+  esac

-    for fn in $forgeFileNames; do
-      downloadUrl=https://maven.minecraftforge.net/net/minecraftforge/forge/$fn
-      log "...trying $downloadUrl"
-      if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
-        return
+  #################################################################################
+
+  log "Checking Forge version information."
+  case $FORGEVERSION in
+    RECOMMENDED)
+      curl -fsSL -o /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
+      FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-recommended\"]")
+      if [ $FORGE_VERSION = null ]; then
+        FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
+        if [ $FORGE_VERSION = null ]; then
+          log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
+          log "       Refer to http://files.minecraftforge.net/ for supported versions"
+          exit 2
+        fi
      fi
-    done
-    log "Unable to locate usable URL for $normForgeVersion"
-    exit 2
- else
-    log "Downloading $FORGE_INSTALLER_URL ..."
-    if ! curl -o $FORGE_INSTALLER -fsSL $FORGE_INSTALLER_URL; then
-      log "Failed to download from given location $FORGE_INSTALLER_URL"
-      exit 2
-    fi
-  fi
-}
+      ;;

-install() {
+    *)
+      FORGE_VERSION=$FORGEVERSION
+      ;;
+  esac
+
+  normForgeVersion=$VANILLA_VERSION-$FORGE_VERSION-$norm
+  shortForgeVersion=$VANILLA_VERSION-$FORGE_VERSION
+
+  FORGE_INSTALLER="/tmp/forge-$shortForgeVersion-installer.jar"
+elif [[ -z $FORGE_INSTALLER ]]; then
+  FORGE_INSTALLER="/tmp/forge-installer.jar"
+elif [[ ! -e $FORGE_INSTALLER ]]; then
+  log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
+  exit 2
+else
+  shortForgeVersion=$VANILLA_VERSION-custom
+fi
+
+installMarker="/data/.forge-installed-$shortForgeVersion"
+
+if [ ! -e $installMarker ]; then
  if [ ! -e $FORGE_INSTALLER ]; then
-    get_installer $normForgeVersion $shortForgeVersion
+
+    if [[ -z $FORGE_INSTALLER_URL ]]; then
+      log "Downloading $normForgeVersion"
+
+      forgeFileNames="
+      $normForgeVersion/forge-$normForgeVersion-installer.jar
+      $shortForgeVersion/forge-$shortForgeVersion-installer.jar
+      END
+    "
+      for fn in $forgeFileNames; do
+        if [ $fn == END ]; then
+          log "Unable to compute URL for $normForgeVersion"
+          exit 2
+        fi
+        downloadUrl=https://maven.minecraftforge.net/net/minecraftforge/forge/$fn
+        log "...trying $downloadUrl"
+        if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
+          break
+        fi
+      done
+    else
+      log "Downloading $FORGE_INSTALLER_URL ..."
+      if ! curl -o $FORGE_INSTALLER -fsSL $FORGE_INSTALLER_URL; then
+        log "Failed to download from given location $FORGE_INSTALLER_URL"
+        exit 2
+      fi
+    fi
  fi

  log "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
@@ -67,69 +114,10 @@ install() {
  export SERVER=$latest
  log "Using server $SERVER"
  echo $SERVER > $installMarker
-}

-resolve_versions() {
-  if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
-    norm=$VANILLA_VERSION
-
-    case $VANILLA_VERSION in
-      *.*.*)
-        norm=$VANILLA_VERSION ;;
-      *.*)
-        norm=${VANILLA_VERSION}.0 ;;
-    esac
-
-    #################################################################################
-
-    log "Checking Forge version information."
-    case $FORGEVERSION in
-      RECOMMENDED)
-        curl -fsSL -o /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
-        FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-recommended\"]")
-        if [ $FORGE_VERSION = null ]; then
-          FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
-          if [ $FORGE_VERSION = null ]; then
-            log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
-            log "       Refer to http://files.minecraftforge.net/ for supported versions"
-            exit 2
-          fi
-        fi
-        ;;
-
-      *)
-        FORGE_VERSION=$FORGEVERSION
-        ;;
-    esac
-
-    normForgeVersion=$VANILLA_VERSION-$FORGE_VERSION-$norm
-    shortForgeVersion=$VANILLA_VERSION-$FORGE_VERSION
-
-    FORGE_INSTALLER="/tmp/forge-$shortForgeVersion-installer.jar"
-  elif [[ -z $FORGE_INSTALLER ]]; then
-    FORGE_INSTALLER="/tmp/forge-installer.jar"
-  elif [[ ! -e $FORGE_INSTALLER ]]; then
-    log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
-    exit 2
-  else
-    shortForgeVersion=$VANILLA_VERSION-${FORGE_INSTALLER_CUSTOM_VERSION:-custom}
-  fi
-}
-
-### main
-
-resolve_versions
-
-installMarker="/data/.forge-installed-$shortForgeVersion"
-
-if [ ! -e $installMarker ]; then
-  install
 else
  export SERVER=$(cat $installMarker)
-  if [ ! -e "$SERVER" ] && versionLessThan 1.17; then
-    rm "$installMarker"
-    install
-  fi
 fi

-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/63
+++ b/63
@@ -1,63 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-. ${SCRIPTS:-/}start-utils
-isDebugging && set -x
-
-: ${LIMBO_BUILD:=LATEST}
-: ${FORCE_REDOWNLOAD:=false}
-: ${LIMBO_SCHEMA_FILENAME:=default.schem}
-: ${LEVEL:=Default;${LIMBO_SCHEMA_FILENAME}}
-# defaults to localhost, if this is not set
-: ${SERVER_IP:=0.0.0.0}
-
-export LEVEL SERVER_IP
-
-if [[ ${LIMBO_BUILD^^} == LATEST ]]; then
-  LIMBO_BUILD=lastStableBuild
-fi
-
-baseUrl="https://ci.loohpjames.com/job/Limbo/${LIMBO_BUILD}"
-buildInfoUrl="${baseUrl}/api/json"
-buildJson=$(curl -fsSL "${buildInfoUrl}")
-if [ $? != 0 ]; then
-  log "ERROR failed to get build info from ${buildInfoUrl} (status=$?)"
-  exit 1
-fi
-
-if [[ ${LIMBO_BUILD} = lastStableBuild ]]; then
-  LIMBO_BUILD=$(jq -r '.number' <<<${buildJson})
-  log "Resolved latest Limbo build to ${LIMBO_BUILD}"
-fi
-artifactPath=$(jq -r '.artifacts[] | select(.fileName|test("^Limbo-")) | .relativePath' <<<${buildJson})
-defaultSchemaPath=$(jq -r '.artifacts[] | select(.fileName|test(".*\\.schem")) | .relativePath' <<<${buildJson})
-
-export SERVER="limbo-${LIMBO_BUILD}.jar"
-
-if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
-    downloadUrl="${baseUrl}/artifact/${artifactPath}"
-    log "Downloading Limbo from $downloadUrl ..."
-    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-
-fi
-
-if [ ! -f "${LIMBO_SCHEMA_FILENAME}" ]; then
-  log "Downloading default schem file"
-  if ! curl -o "${LIMBO_SCHEMA_FILENAME}" -fsSL "${baseUrl}/artifact/${defaultSchemaPath}"; then
-      log "ERROR: failed to download schema file $baseUrl (status=$?)"
-      exit 3
-  fi
-fi
-
-if [[ ${LEVEL} != *\;* ]]; then
-  LEVEL="${LEVEL};${LIMBO_SCHEMA_FILENAME}"
-fi
-export LEVEL
-
-export SKIP_LOG4J_CONFIG=true
-
-exec ${SCRIPTS:-/}start-setupWorld $@
--- a/92
+++ b/92
@@ -1,92 +1,18 @@
 #!/bin/bash

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

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

-: ${VANILLA_VERSION?}
-# stable, dev
-: ${MAGMA_CHANNEL:=stable}
-
-
-magmaDownloadServer() {
-  url=${1?}
-  tagName=${2?}
-  markerFile=${3?}
-
-  export SERVER="/data/magma-server-${VANILLA_VERSION}.jar"
-
-  log "Downloading Magma server file for ${VANILLA_VERSION} @ ${tagName}"
-  if ! curl -o /data/magma-server-${VANILLA_VERSION}.jar -fsSL "$url"; then
-    log "ERROR failed to download Magma server from $url (status=$?)"
-    exit 1
-  fi
-
-  echo -n "$SERVER" > "$markerFile"
-}
-
-magmaHandleInstaller() {
-  url=${1?}
-  tagName=${2?}
-  markerFile=${3?}
-
-  installerFile="magma-installer-${VANILLA_VERSION}-${tagName}.jar"
-  log "Downloading Magma installer file for ${VANILLA_VERSION} @ ${tagName}"
-  if ! curl -o "$installerFile" -fsSL "$url"; then
-    log "ERROR failed to download Magma installer from $url (status=$?)"
-    exit 1
-  fi
-
-  echo "forge" > "$markerFile"
-
-  export FORGE_INSTALLER="$installerFile"
-  export FORGE_INSTALLER_CUSTOM_VERSION="$tagName"
-
-  # now hand off the rest to forge
-  exec ${SCRIPTS:-/}start-deployForge "$@"
-}
-
-latestMeta=$(curl -fsSL https://api.magmafoundation.org/api/resources/Magma/${VANILLA_VERSION}/${MAGMA_CHANNEL}/latest || exit $?)
-if [ $? != 0 ]; then
-  log "ERROR failed to locate latest Magma info for ${VANILLA_VERSION} in channel ${MAGMA_CHANNEL} (error=$?)"
+# Always download since new updates of each base version are published frequently
+if ! curl -o /data/magma-server-${VANILLA_VERSION}.jar -fsSL \
+  https://api.magmafoundation.org/api/resources/Magma/${VANILLA_VERSION}/stable/latest/download; then
+  log "ERROR unable to download version ${VANILLA_VERSION} of Magma"
+  log "      Check https://magmafoundation.org/ for available versions"
  exit 1
 fi

-tagName=$(echo "${latestMeta}" | jq -r '.tag_name')
-markerFile=".magma-installed-${VANILLA_VERSION}-${tagName}"
-if [ -f "${markerFile}" ]; then
-  installedTagName=$(cat "${markerFile}")
-fi
+export SKIP_LOG4J_CONFIG=true

-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
-
-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/3
+++ b/3
@@ -40,4 +40,5 @@ fi

 export SKIP_LOG4J_CONFIG=true

-exec ${SCRIPTS:-/}start-setupWorld "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld "$@"
--- a/0
+++ b/0
--- a/4
+++ b/4
@@ -10,7 +10,7 @@ isDebugging && set -x
 : ${FORCE_REDOWNLOAD:=false}

 if [[ ${PURPUR_BUILD} == LATEST ]]; then
-  PURPUR_BUILD=$(curl -fsSL "https://api.pl3x.net/v2/purpur/${VANILLA_VERSION}" |
+  PURPUR_BUILD=$(curl -fsSL "https://purpur.pl3x.net/api/v1/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://api.pl3x.net/v2/purpur/${VANILLA_VERSION}/${PURPUR_BUILD}/download"
+    downloadUrl="https://purpur.pl3x.net/api/v1/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/3
+++ b/3
@@ -37,4 +37,5 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
  curl -sSL -o $SERVER https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER
 fi

-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/26
+++ b/26
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+if [ "${VERSION}" != "LATEST" ]; then
+  log "ERROR: Tunity server type only supports VERSION=LATEST"
+  exit 1
+fi
+
+: ${TUNITY_BUILD:=lastSuccessfulBuild}
+export SERVER=tunity-${VANILLA_VERSION}-${TUNITY_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 ..."
+    curl -fsSL -o "$SERVER" "$downloadUrl"
+    if [ ! -f "$SERVER" ]; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
+      exit 3
+    fi
+fi
+
+# Normalize on Spigot for later operations
+export TYPE=SPIGOT
+
+exec ${SCRIPTS:-/}start-spiget "$@"
--- a/21
+++ b/21
@@ -1,39 +1,41 @@
 #!/bin/bash

-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
+. ${SCRIPTS:-/}start-utils
 isDebugging && set -x
 set -o pipefail

 export SERVER="minecraft_server.${VANILLA_VERSION// /_}.jar"

-if [ ! -e "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
+if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
  log "Downloading $SERVER ..."
  debug "Finding version manifest for $VANILLA_VERSION"
-  versionManifestUrl=$(get 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url')
+  versionManifestUrl=$(curl -fsSL 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url')
  result=$?
  if [ $result != 0 ]; then
    log "ERROR failed to obtain version manifest URL ($result)"
    exit 1
  fi
-  if [ "$versionManifestUrl" = "null" ]; then
+  if [ $versionManifestUrl = "null" ]; then
    log "ERROR couldn't find a matching manifest entry for $VANILLA_VERSION"
    exit 1
  fi
  debug "Found version manifest at $versionManifestUrl"

-  serverDownloadUrl=$(get --json-path '$.downloads.server.url' "${versionManifestUrl}")
+  serverDownloadUrl=$(curl -fsSL ${versionManifestUrl} | jq --raw-output '.downloads.server.url')
  result=$?
  if [ $result != 0 ]; then
    log "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
    exit 1
-  elif [ "$serverDownloadUrl" = "null" ]; then
+  elif [ $serverDownloadUrl = null ]; then
    log "ERROR version $VANILLA_VERSION does not provide a server download"
    exit 1
  fi

  debug "Downloading server from $serverDownloadUrl"
-  get -o "$SERVER" "$serverDownloadUrl"
+  if isDebugging; then
+    verbose=-v
+  fi
+  curl $verbose -fsSL -o $SERVER $serverDownloadUrl
  result=$?
  if [ $result != 0 ]; then
    log "ERROR failed to download server from $serverDownloadUrl ($result)"
@@ -43,4 +45,5 @@ fi

 isDebugging && ls -l

-exec "${SCRIPTS:-/}start-setupWorld" "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/30
+++ b/30
@@ -0,0 +1,30 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+. ${SCRIPTS:-/}start-utils
+isDebugging && set -x
+
+: ${VANILLA_VERSION:?}
+: ${RELEASE:=latest}
+: ${FORCE_REDOWNLOAD:=false}
+
+requireEnum RELEASE stable latest
+
+export SERVER="yatopia-${RELEASE}-${VANILLA_VERSION}.jar"
+
+if [ ! -f "$SERVER" ] || isTrue "$FORCE_REDOWNLOAD"; then
+    downloadUrl="https://api.yatopiamc.org/v2/${RELEASE}Build/download?branch=ver/${VANILLA_VERSION}"
+    log "Downloading Yatopia from $downloadUrl ..."
+    if ! curl -fsSL -o "$SERVER" "$downloadUrl"; then
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
+      exit 3
+    fi
+fi
+
+# Normalize on Spigot for later operations
+export TYPE=SPIGOT
+export SKIP_LOG4J_CONFIG=true
+
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/51
+++ b/51
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+: ${ENV_VARIABLE_PREFIX:=CFG_}
+
+if isTrue "${REPLACE_ENV_VARIABLES}"; then
+  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX ..."
+
+  # File excludes
+  fileExcludes=
+  for f in ${REPLACE_ENV_VARIABLES_EXCLUDES}; do
+    fileExcludes="${fileExcludes} -not -name $f"
+  done
+
+  # Directory excludes (recursive)
+  dirExcludes=$(join_by " -o -path " ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS})
+  if [[ $dirExcludes ]]; then
+    dirExcludes=" -type d ( -path ${dirExcludes} ) -prune -o"
+  fi
+
+  isDebugging && echo "Using find file exclusions: $fileExcludes"
+  isDebugging && echo "Using find directory exclusions: $dirExcludes"
+
+  for name in $(compgen -v $ENV_VARIABLE_PREFIX); do
+    # check if name of env variable matches the prefix
+    # sanity check environment variables to avoid code injections
+    # Read content from file environment
+    if [[ $name = *"_FILE" ]]; then
+      value=$(<${!name})
+      name="${name%_FILE}"
+    else
+      value=${!name}
+    fi
+
+    log "Replacing $name with $value ..."
+
+    value=${value//\\/\\\\}
+    value=${value//#/\\#}
+
+    find /data/ \
+        $dirExcludes \
+        -type f \
+        \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" \
+        -or -name "*.conf" -or -name "*.properties" -or -name "*.hjson" -or -name "*.json" \) \
+        $fileExcludes \
+        -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
+  done
+fi
+
+exec ${SCRIPTS:-/}start-minecraftFinalSetup $@
--- a/2
+++ b/2
@@ -24,4 +24,4 @@ case "X$MODCONFIG" in
 esac
 fi

-exec ${SCRIPTS:-/}start-setupMounts $@
+exec ${SCRIPTS:-/}start-finalSetupMounts $@
--- a/32
+++ b/32
@@ -2,7 +2,6 @@

 set -e -o pipefail

-# shellcheck source=start-utils
 . ${SCRIPTS:-/}start-utils
 if isDebugging; then
  set -x
@@ -23,7 +22,7 @@ if [[ "$MODPACK" ]]; then
    if [[ "${MODPACK}" == *.zip ]]; then
      downloadUrl="${MODPACK}"
    else
-      downloadUrl=$(curl -Ls -o /dev/null -w %{url_effective} $MODPACK)
+      downloadUrl=$(curl -Ls -o /dev/null -w %{effective_url} $MODPACK)
      if ! [[ $downloadUrl == *.zip ]]; then
        log "ERROR Invalid URL given for MODPACK: $downloadUrl resolved from $MODPACK"
        log "      Must be HTTP, HTTPS or FTP and a ZIP file"
@@ -72,11 +71,25 @@ if [[ "$MODS" ]]; then

  for i in ${MODS//,/ }
  do
-    if isURL "$i"; then
+    if isURL $i; then
      log "Downloading mod/plugin $i ..."
-      if ! get -o "${out_dir}" "$i"; then
-        log "ERROR: failed to download from $i into $out_dir"
-        exit 2
+      if isValidFileURL jar "$i"; then
+        if ! curl -fsSL -o "${out_dir}/$(getFilenameFromUrl "${i}")" "${i}"; then
+          log "ERROR: failed to download from $i into $out_dir"
+          exit 2
+        fi
+      else
+        effective_url=$(resolveEffectiveUrl "$i")
+        if isValidFileURL jar "${effective_url}"; then
+          out_file=$(getFilenameFromUrl "${effective_url}")
+          if ! curl -fsSL -o "${out_dir}/$out_file" "${effective_url}"; then
+            log "ERROR: failed to download from $i into $out_dir"
+            exit 2
+          fi
+        else
+          log "ERROR: $effective_url resolved from $i is not a valid jar URL"
+          exit 2
+        fi
      fi
    elif [[ -f "$i" && "$i" =~ .*\.jar ]]; then
      log "Copying plugin located at $i ..."
@@ -141,10 +154,7 @@ fi
 if [[ "${GENERIC_PACK}" ]]; then
  if isURL "${GENERIC_PACK}"; then
    log "Downloading generic pack ..."
-    if ! curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"; then
-      log "ERROR: failed to download ${GENERIC_PACK}"
-      exit 2
-    fi
+    curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"
    GENERIC_PACK=/tmp/generic_pack.zip
  fi

@@ -175,4 +185,4 @@ if [[ "${GENERIC_PACK}" ]]; then
  fi
 fi

-exec ${SCRIPTS:-/}start-setupModconfig $@
+exec ${SCRIPTS:-/}start-finalSetupModconfig $@
--- a/40
+++ b/40
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+: ${PLUGINS_SYNC_UPDATE:=true}
+
+isDebugging && set -x
+
+if [ -d /plugins ]; then
+  case ${TYPE} in
+    SPIGOT|BUKKIT|PAPER|MAGMA)
+      mkdir -p /data/plugins
+      log "Copying plugins over..."
+      if isTrue ${PLUGINS_SYNC_UPDATE}; then
+        updateArg="--update"
+      fi
+      # Copy plugins over using rsync to allow deeply nested updates of plugins
+      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs $updateArg /plugins /data
+      ;;
+  esac
+fi
+
+# If any modules have been provided, copy them over
+: ${COPY_MODS_DEST:="/data/mods"}
+
+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
+fi
+
+: ${COPY_CONFIG_DEST:="/data/config"}
+
+if [ -d /config ]; then
+  log "Copying any configs from /config to $COPY_CONFIG_DEST"
+  mkdir -p $COPY_CONFIG_DEST
+  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /config/ $COPY_CONFIG_DEST
+fi
+
+exec ${SCRIPTS:-/}start-finalSetupServerProperties $@
--- a/9
+++ b/9
@@ -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" ] || isTrue ${ENABLE_WHITELIST:-false}; then
+  if [ -n "$WHITELIST" ]; then
    log "Creating whitelist"
    setServerProp "whitelist" "true"
    setServerProp "white-list" "true"
@@ -56,7 +56,7 @@ function customizeServerProps {
  setServerProp "server-name" "$SERVER_NAME"
  setServerProp "server-ip" "$SERVER_IP"
  setServerProp "server-port" "$SERVER_PORT"
-  setServerProp "motd" "$(echo $MOTD | mc-image-helper asciify)"
+  setServerProp "motd" "$MOTD"
  setServerProp "allow-nether" "$ALLOW_NETHER"
  setServerProp "announce-player-achievements" "$ANNOUNCE_PLAYER_ACHIEVEMENTS"
  setServerProp "enable-command-block" "$ENABLE_COMMAND_BLOCK"
@@ -100,7 +100,6 @@ function customizeServerProps {
  setServerProp "prevent-proxy-connections" "$PREVENT_PROXY_CONNECTIONS"
  setServerProp "use-native-transport" "$USE_NATIVE_TRANSPORT"
  setServerProp "enforce-whitelist" "$ENFORCE_WHITELIST"
-  setServerProp "simulation-distance" "$SIMULATION_DISTANCE"

  if [ -n "$DIFFICULTY" ]; then
    case $DIFFICULTY in
@@ -218,4 +217,4 @@ if isDebugging; then
  cat "${SERVER_PROPERTIES}"
 fi

-exec ${SCRIPTS:-/}start-setupEnvVariables $@
+exec ${SCRIPTS:-/}start-finalSetupEnvVariables $@
--- a/2
+++ b/2
@@ -71,4 +71,4 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
  fi
 fi

-exec ${SCRIPTS:-/}start-setupModpack $@
+exec ${SCRIPTS:-/}start-finalSetupModpack $@
--- a/37
+++ b/37
@@ -172,32 +172,25 @@ function copyFilesForCurseForge() {
  cp -f /data/eula.txt "${FTB_DIR}/"
 }

-mcServerRunnerArgs=(
--stop-duration "${STOP_DURATION:-60}s"
--named-pipe "${CONSOLE_IN_NAMED_PIPE:-/tmp/minecraft-console-in}"
-)
-if [[ ${STOP_SERVER_ANNOUNCE_DELAY} ]]; then
-  mcServerRunnerArgs+=(--stop-server-announce-delay "${STOP_SERVER_ANNOUNCE_DELAY}s")
-fi
-
+mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
    if isTrue ${DEBUG_EXEC}; then
      set -x
    fi
-    exec mc-server-runner "${mcServerRunnerArgs[@]}" \
+    exec mc-server-runner ${mcServerRunnerArgs} \
      --cf-instance-file "${CURSE_INSTANCE_JSON}" \
      java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS
 elif [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
  copyFilesForCurseForge

-  cd "${FTB_DIR}" || (log "ERROR: can't go into ${FTB_DIR}"; exit 1)
+  cd "${FTB_DIR}"
  log "Starting CurseForge server in ${FTB_DIR}..."
  if isTrue ${DEBUG_EXEC}; then
    set -x
  fi
-  exec mc-server-runner ${bootstrapArgs} "${mcServerRunnerArgs[@]}" java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
+  exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $(basename "${SERVER}") "$@" $EXTRA_ARGS
 elif [[ ${TYPE} == "CURSEFORGE" ]]; then
-  mcServerRunnerArgs+=(--shell bash)
+  mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"

  copyFilesForCurseForge

@@ -212,13 +205,15 @@ EOF
    sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg"
  fi

-  cd "${FTB_DIR}" || (log "ERROR: can't go into ${FTB_DIR}"; exit 1)
+  cd "${FTB_DIR}"
  log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."

-  finalArgs="${FTB_SERVER_START}"
+  finalArgs=(
+    "${FTB_SERVER_START}"
+  )

  if isTrue ${SETUP_ONLY:=false}; then
-    echo "SETUP_ONLY: ${finalArgs}"
+    echo "SETUP_ONLY: ${finalArgs[@]}"
    exit
  fi

@@ -228,12 +223,8 @@ EOF
  if isTrue ${EXEC_DIRECTLY:-false}; then
    "${finalArgs[@]}"
  else
-    exec mc-server-runner "${mcServerRunnerArgs[@]}" "${finalArgs[@]}"
+    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
@@ -246,12 +237,12 @@ else
    $JVM_XX_OPTS
    $JVM_OPTS
    $expandedDOpts
-    -jar "$SERVER"
+    -jar $SERVER
    "$@" $EXTRA_ARGS
  )

  if isTrue ${SETUP_ONLY:=false}; then
-    echo "SETUP_ONLY: java ${finalArgs[*]}"
+    echo "SETUP_ONLY: java ${finalArgs[@]}"
    exit
  fi

@@ -262,7 +253,7 @@ else
  if isTrue ${EXEC_DIRECTLY:-false}; then
    exec java "${finalArgs[@]}"
  else
-    exec mc-server-runner ${bootstrapArgs} "${mcServerRunnerArgs[@]}" java "${finalArgs[@]}"
+    exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java "${finalArgs[@]}"
  fi
 fi

--- a/34
+++ b/34
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. ${SCRIPTS:-/}start-utils
-
-set -e
-
-: ${REPLACE_ENV_IN_PLACE:=${REPLACE_ENV_VARIABLES:-false}}
-: ${REPLACE_ENV_PATHS:=/data}
-: ${REPLACE_ENV_SUFFIXES:=yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml}
-: ${REPLACE_ENV_VARIABLE_PREFIX:=${ENV_VARIABLE_PREFIX:-CFG_}}
-: ${REPLACE_ENV_VARIABLES_EXCLUDES:=}
-: ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}
-: ${PATCH_DEFINITIONS:=}
-: ${DEBUG:=false}
-
-if isTrue "${REPLACE_ENV_IN_PLACE}"; then
-  log "Replacing env variables in ${REPLACE_ENV_PATHS} that match the prefix $REPLACE_ENV_VARIABLE_PREFIX ..."
-
-  mc-image-helper --debug=${DEBUG} interpolate \
-    --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
-    --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
-    --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-    --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-    "${REPLACE_ENV_PATHS[@]}"
-fi
-
-if [[ ${PATCH_DEFINITIONS} ]]; then
-  log "Applying patch definitions from ${PATCH_DEFINITIONS}"
-  mc-image-helper --debug=${DEBUG} patch \
-    --patch-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-    "${PATCH_DEFINITIONS}"
-fi
-
-exec ${SCRIPTS:-/}start-finalExec $@
--- a/69
+++ b/69
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-. ${SCRIPTS:-/}start-utils
-
-: ${SYNC_SKIP_NEWER_IN_DESTINATION:=${PLUGINS_SYNC_UPDATE:-true}}
-: ${REPLACE_ENV_DURING_SYNC:=true}
-: ${REPLACE_ENV_SUFFIXES:=yml,yaml,txt,cfg,conf,properties,hjson,json,tml,toml}
-: ${REPLACE_ENV_VARIABLE_PREFIX:=${ENV_VARIABLE_PREFIX:-CFG_}}
-: ${REPLACE_ENV_VARIABLES_EXCLUDES:=}
-: ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS:=}
-: ${DEBUG:=false}
-
-set -e
-isDebugging && set -x
-
-if isTrue ${SYNC_SKIP_NEWER_IN_DESTINATION}; then
-  updateArg="--skip-newer-in-destination"
-fi
-
-if isTrue ${REPLACE_ENV_DURING_SYNC}; then
-  subcommand=sync-and-interpolate
-else
-  subcommand=sync
-fi
-
-if [ -d /plugins ]; then
-  case ${TYPE} in
-    SPIGOT|BUKKIT|PAPER|MAGMA)
-      mkdir -p /data/plugins
-      log "Copying plugins over..."
-      mc-image-helper \
-        --debug=${DEBUG} ${subcommand} $updateArg \
-        --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
-        --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
-        --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-        --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-        /plugins /data/plugins
-      ;;
-  esac
-fi
-
-# If any modules have been provided, copy them over
-: ${COPY_MODS_DEST:="/data/mods"}
-
-if [ -d /mods ]; then
-  log "Copying any mods over..."
-  mc-image-helper \
-    --debug=${DEBUG} ${subcommand} $updateArg \
-    --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
-    --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
-    --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-    --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-    /mods "${COPY_MODS_DEST}"
-fi
-
-: ${COPY_CONFIG_DEST:="/data/config"}
-
-if [ -d /config ]; then
-  log "Copying any configs from /config to ${COPY_CONFIG_DEST}"
-  mc-image-helper \
-    --debug=${DEBUG} ${subcommand} $updateArg \
-    --replace-env-file-suffixes="${REPLACE_ENV_SUFFIXES}" \
-    --replace-env-excludes="${REPLACE_ENV_VARIABLES_EXCLUDES}" \
-    --replace-env-exclude-paths="${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}" \
-    --replace-env-prefix=${REPLACE_ENV_VARIABLE_PREFIX} \
-    /config "${COPY_CONFIG_DEST}"
-fi
-
-exec ${SCRIPTS:-/}start-setupServerProperties $@
--- a/48
+++ b/48
@@ -6,7 +6,6 @@ IFS=$'\n\t'
 handleDebugMode

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

 containsJars() {
  file=${1?}
@@ -27,49 +26,6 @@ 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
@@ -77,6 +33,7 @@ downloadResourceFromSpiget() {
    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}"
@@ -101,4 +58,5 @@ if [[ ${SPIGET_RESOURCES} ]]; then
  done
 fi

-exec ${SCRIPTS:-/}start-setupWorld $@
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/8
+++ b/8
@@ -180,11 +180,3 @@ function removeOldMods {
    find "$1" -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE:-}" -delete
  fi
 }
-
-function get() {
-  local flags=()
-  if isTrue "${DEBUG_GET:-false}"; then
-    flags+=("--debug")
-  fi
-  mc-image-helper "${flags[@]}" get "$@"
-}
--- a/3
+++ b/3
@@ -14,4 +14,5 @@ fi

 log "Resolved CURSE_INSTANCE_JSON as ${CURSE_INSTANCE_JSON}"

-exec ${SCRIPTS:-/}start-setupWorld "$@"
+# Continue to Final Setup
+exec ${SCRIPTS:-/}start-finalSetupWorld "$@"
--- a/tests/docker-compose.test.yml
+++ b/tests/docker-compose.test.yml
@@ -17,4 +17,5 @@ services:
      - itzg/minecraft-server:latest
    environment:
      EULA: "TRUE"
+      VERSION: "1.16.5"
Author	SHA1	Message	Date
Geoff Bourne	6e10768e7f	ci: test java8 with VERSION=1.16.5	2021-06-20 13:49:02 -05:00
Geoff Bourne	bb47a3705d	Auto merge branch with master	2021-06-20 12:46:28 -05:00
Geoff Bourne	c3e1e92547	Auto-merging via docker-versions-create	2021-06-20 12:46:25 -05:00
Geoff Bourne	9ddd768f44	Auto-merging via docker-versions-create	2021-06-05 17:49:30 -05:00
Geoff Bourne	62e1ff8ffa	Restored correct ps usage for autopause in Alpine #897	2021-05-27 08:22:17 -05:00
Geoff Bourne	5f95d135f5	Auto-merging via docker-versions-create	2021-05-24 20:49:44 -05:00
Geoff Bourne	8e32d26b0f	Merge branch 'master' into java8	2021-05-23 12:26:33 -05:00
Geoff Bourne	573f064970	Merge from master	2021-05-22 12:58:53 -05:00
Geoff Bourne	0bc6f4075b	Auto-merging via docker-versions-create	2021-05-21 23:01:07 -05:00
Geoff Bourne	4ebcc0ef48	Auto-merging via docker-versions-create	2021-05-21 22:47:21 -05:00
Geoff Bourne	57720cf394	Merge branch 'master' into java8	2021-05-21 22:15:35 -05:00
Geoff Bourne	64b2783f19	ci: restored changes for java8	2021-05-21 17:18:57 -05:00
Geoff Bourne	1dbdd7628a	Merge branch 'master' into java8	2021-05-21 17:04:24 -05:00
Geoff Bourne	4252ec710f	ci: use CACHE_NAME in main.yml	2021-05-21 17:04:11 -05:00
Geoff Bourne	11d455c284	Merge branch 'master' into java8 # Conflicts: # Dockerfile	2021-05-21 17:02:17 -05:00
Geoff Bourne	08bc419dc8	Auto-merging via docker-versions-create	2021-05-19 20:27:11 -05:00
Geoff Bourne	67c23017d0	Auto-merging via docker-versions-create	2021-05-19 20:24:31 -05:00
Geoff Bourne	6e1ba3667c	Auto-merging via docker-versions-create	2021-05-19 20:18:57 -05:00
Geoff Bourne	0c2f8b903b	Auto-merging via docker-versions-create	2021-05-15 12:40:56 -05:00
Geoff Bourne	b9335d9cd6	Auto-merging via docker-versions-create	2021-05-06 20:12:25 -05:00
Geoff Bourne	0d92092b90	Auto-merging via docker-versions-create	2021-04-30 14:27:40 -05:00
Geoff Bourne	e653a41b3f	Auto-merging via docker-versions-create	2021-04-30 11:11:19 -05:00
Geoff Bourne	82e63c54c4	Auto-merging via docker-versions-create	2021-04-28 16:50:55 -05:00
Geoff Bourne	f9c573f598	Auto-merging via docker-versions-create	2021-04-26 08:20:41 -05:00
Geoff Bourne	bf8b9cf20d	Auto-merging via docker-versions-create	2021-04-24 13:42:07 -05:00
Geoff Bourne	0dd5a412d9	Auto-merging via docker-versions-create	2021-04-23 21:02:46 -05:00
Geoff Bourne	b389561091	Auto-merging via docker-versions-create	2021-04-18 13:29:12 -05:00
Geoff Bourne	6ee055761d	Merge branch 'master' into java8	2021-04-11 10:41:32 -05:00
Geoff Bourne	49f9ff645e	Auto-merging via docker-versions-create	2021-04-11 10:08:47 -05:00
Geoff Bourne	004cbdb9f7	Auto-merging via docker-versions-create	2021-04-08 19:12:56 -05:00
Geoff Bourne	45856a1a81	Auto-merging via docker-versions-create	2021-04-01 16:30:55 -05:00
Geoff Bourne	1e615e76e8	Merge branch 'master' into java8 # Conflicts: # start-configuration # start-deployCF	2021-03-18 19:58:16 -05:00
Geoff Bourne	1c85a685de	Added support for CF modpacks using settings.cfg #772 #800	2021-03-14 15:02:40 -05:00
Geoff Bourne	7cd207f40b	docs: Added more info about getbukkit's weird 1.8 file naming #103	2021-03-13 16:54:56 -06:00
Geoff Bourne	140a8aa90c	Merge branch 'master' into java8	2021-03-11 19:40:26 -06:00
Geoff Bourne	76dcff9d18	Merge branch 'master' into java8	2021-03-11 17:23:48 -06:00
Geoff Bourne	a9a86d249b	Merge branch 'master' into java8 # Conflicts: # start-configuration	2021-03-06 16:23:07 -06:00
Geoff Bourne	595760d301	Shifted PATH-fix earlier in startup	2021-03-06 16:04:06 -06:00
Geoff Bourne	6d3f194ce3	Merge from master	2021-02-27 20:47:00 -06:00
Geoff Bourne	21c1620f0c	misc: java is actually found in /usr/bin by default	2021-02-11 15:05:45 -06:00
Geoff Bourne	e78e5af96d	Fix PATH to include java when needed	2021-02-10 14:49:13 -06:00
Geoff Bourne	0fb9700fc7	Auto-merging via docker-versions-create	2021-02-10 14:01:35 -06:00
Geoff Bourne	18925ef32c	Merged latest from master	2021-02-08 21:16:50 -06:00
Geoff Bourne	f06b990f8a	Auto-merging via docker-versions-create	2021-02-07 18:03:40 -06:00
Geoff Bourne	75844ae81a	Fix java8 base image to actually be Java 8 #753	2021-02-07 11:10:38 -06:00
Geoff Bourne	6bb2323c46	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in docker-versions-create.sh Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.	2021-02-07 09:07:30 -06:00
Geoff Bourne	7814ca21b5	Merge branch 'master' into java8 # Conflicts: # README.md # start-configuration	2021-01-30 18:56:33 -06:00
Geoff Bourne	b8806629ec	Merged latest from master	2021-01-30 16:48:11 -06:00
Geoff Bourne	4a7f838a0f	Upgraded mainline/latest to Java 11	2021-01-30 16:16:36 -06:00
Geoff Bourne	2d07dee4df	Prepared forge branch's Dockerfile	2021-01-30 15:58:03 -06:00