Auto-merging via docker-versions-create

2026-02-17 15:13:55 +00:00 · 2020-07-11 13:13:04 -05:00 · 2020-07-10 17:11:06 -05:00 · 2020-07-04 14:57:31 -05:00 · 2020-06-20 15:44:28 -05:00 · 2020-06-19 13:26:25 -05:00
36 changed files with 390 additions and 936 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,5 @@
 data
-testdata
 examples
 k8s-examples
 .idea
-.git
+.git
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,2 @@
 [start-*]
-indent_size = 2
-indent_style = space
-end_of_line = lf
+indent_size = 2
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -1,80 +0,0 @@
-name: Build and publish multiarch
-on:
-  push:
-    branches:
-      - multiarch
-      - java8-multiarch
-      - multiarch-latest
-      - java15
-      - test/multiarch/*
-    tags:
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch"
-      - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
-      - "[0-9]+.[0-9]+.[0-9]+-java15"
-
-jobs:
-  docker-buildx:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.2.0
-
-      - name: Prepare
-        id: prep
-        run: |
-          DOCKER_IMAGE=itzg/minecraft-server
-          VERSION=edge
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/}
-          fi
-          if [[ $GITHUB_REF == refs/heads/* ]]; then
-            VERSION=${GITHUB_REF#refs/heads/}
-            if [[ $VERSION == master ]]; then
-              VERSION=latest
-            fi
-          fi
-          TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=cache_from::${TAGS}
-          echo ::set-output name=version::${VERSION//\//-}
-          echo ::set-output name=cache_version::${VERSION//\//-}
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.prep.outputs.tags }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-          labels: |
-            org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
-            org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
-            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
-            org.opencontainers.image.revision=${{ github.sha }}
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,94 +4,32 @@ on:
  push:
    branches:
      - master
-      - java8
      - openj9
-      - openj9-11
+      - openj9-nightly
      - adopt11
-      - test/*
+      - adopt13
    tags:
      - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+-java8"
      - "[0-9]+.[0-9]+.[0-9]+-openj9"
-      - "[0-9]+.[0-9]+.[0-9]+-openj9-11"
      - "[0-9]+.[0-9]+.[0-9]+-openj9-nightly"
      - "[0-9]+.[0-9]+.[0-9]+-adopt11"
+      - "[0-9]+.[0-9]+.[0-9]+-adopt13"

 jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Run tests
-        run: |
-          tests/test.sh
  build:
-    needs:
-      - test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest

    steps:
    - uses: actions/checkout@v2

-    - name: Prepare
-      id: prep
-      run: |
-        DOCKER_IMAGE=itzg/minecraft-server
-        VERSION=edge
-        if [[ $GITHUB_REF == refs/tags/* ]]; then
-          VERSION=${GITHUB_REF#refs/tags/}
-        fi
-        if [[ $GITHUB_REF == refs/heads/* ]]; then
-          VERSION=${GITHUB_REF#refs/heads/}
-          if [[ $VERSION == master ]]; then
-            VERSION=latest
-          fi
-        fi
-        TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
-        echo ::set-output name=tags::${TAGS}
-        echo ::set-output name=cache_from::${TAGS}
-        echo ::set-output name=version::${VERSION//\//-}
-        echo ::set-output name=cache_version::${VERSION//\//-}
-
-    - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Cache Docker layers
-      uses: actions/cache@v2
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
-          ${{ runner.os }}-buildx-
-
-    - name: Login to DockerHub
-      uses: docker/login-action@v1
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v1.1.0
      with:
+        repository: itzg/minecraft-server
        username: ${{ secrets.DOCKER_USER }}
        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Build and push
-      id: docker_build
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./Dockerfile
-        # ensure latest base image is used
-        pull: true
-        # publish
+        tag_with_ref: true
+        tag_with_sha: false
+        cache_froms: itzg/minecraft-server:latest
+        add_git_labels: true
        push: true
-        # 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
-        labels: |
-          org.opencontainers.image.documentation=https://github.com/itzg/docker-minecraft-server
-          org.opencontainers.image.version=${{ steps.prep.outputs.version }}
-          org.opencontainers.image.source=https://github.com/itzg/docker-minecraft-server
-          org.opencontainers.image.revision=${{ github.sha }}
-
-    - name: Image digest
-      run: echo ${{ steps.docker_build.outputs.digest }}
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -5,12 +5,15 @@ on:
    branches: [ master ]

 jobs:
-  test:
+  build:
    runs-on: ubuntu-latest

    steps:
      - uses: actions/checkout@v2

-      - name: Run tests
-        run: |
-          tests/test.sh
+      - name: Build Docker image
+        uses: docker/build-push-action@v1.1.0
+        with:
+          tag_with_sha: true
+          cache_froms: itzg/minecraft-server:latest
+          push: false
--- a/14
+++ b/14
@@ -1,9 +1,6 @@
-FROM adoptopenjdk/openjdk11:alpine-jre
+FROM adoptopenjdk/openjdk8-openj9:alpine-nightly

-LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
-
-# upgrade all packages since alpine jre8 base image tops out at 8u212
-RUN apk -U --no-cache upgrade
+LABEL maintainer "itzg"

 RUN apk add --no-cache -U \
  openssl \
@@ -55,7 +52,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
 --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
- --var version=1.5.0 --var app=mc-server-runner --file {{.app}} \
+ --var version=1.4.3 --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} \
@@ -70,12 +67,11 @@ COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data

 ENV UID=1000 GID=1000 \
-  JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
+  MEMORY="1G" \
  TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
  PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
  LEVEL_TYPE=DEFAULT SERVER_PORT=25565 ONLINE_MODE=TRUE SERVER_NAME="Dedicated Server" \
-  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
-  AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
+  ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 AUTOPAUSE_PERIOD=10

 COPY start* /
 COPY health.sh /
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/itzg/minecraft-server.svg)](https://hub.docker.com/r/itzg/minecraft-server/)
 [![Docker Stars](https://img.shields.io/docker/stars/itzg/minecraft-server.svg?maxAge=2592000)](https://hub.docker.com/r/itzg/minecraft-server/)
 [![GitHub Issues](https://img.shields.io/github/issues-raw/itzg/docker-minecraft-server.svg)](https://github.com/itzg/docker-minecraft-server/issues)
-[![Discord](https://img.shields.io/discord/660567679458869252?label=Discord&logo=discord)](https://discord.gg/DXfKpjB)
+[![Discord](https://img.shields.io/discord/660567679458869252)](https://discord.gg/DXfKpjB)
 [![Build and Publish](https://github.com/itzg/docker-minecraft-server/workflows/Build%20and%20Publish/badge.svg)](https://github.com/itzg/docker-minecraft-server/actions)
 [![](https://img.shields.io/badge/Donate-Buy%20me%20a%20coffee-orange.svg)](https://www.buymeacoffee.com/itzg)

@@ -11,7 +11,7 @@ latest snapshot. See the _Versions_ section below for more information.

 To simply use the latest stable version, run

-    docker run -d -p 25565:25565 --name mc -e EULA=TRUE itzg/minecraft-server
+    docker run -d -p 25565:25565 --name mc itzg/minecraft-server

 where the standard server port, 25565, will be exposed on your host machine.

@@ -35,7 +35,6 @@ With that you can easily view the logs, stop, or re-start the container:
    docker stop mc

    docker start mc
-*Be sure to always include `-e EULA=TRUE` in your commands, as Mojang/Microsoft requires EULA acceptance.*

 ## Looking for a Bedrock Dedicated Server

@@ -116,24 +115,8 @@ to map a directory on your host machine to the container's `/data` directory, su

    docker run -d -v /path/on/host:/data ...

-When attached in this way you can stop the server, edit the configuration under your attached `/path/on/host` and start the server again with `docker start CONTAINER_ID` to pick up the new configuration.
-
-As example, using Docker compose, create the following `docker-compose.yml` in its own directory and the container will automatically create/attach the relative directory `data` to the container:
-
-```yaml
-version: "3"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    ports:
-      - 25565:25565
-    environment:
-      EULA: "TRUE"
-    volumes:
-      # attach the relative directory 'data' to the container's /data path
-      ./data:/data
-```
+When attached in this way you can stop the server, edit the configuration under your attached `/path/on/host`
+and start the server again with `docker start CONTAINERID` to pick up the new configuration.

 ## Versions

@@ -160,31 +143,20 @@ the server jar remain in the `/data` directory. It is safe to remove those._

 To use a different version of Java, please use a docker tag to run your Minecraft server.

-| Tag name       | Java version | Linux  | JVM Type | Architecture      |
-| -------------- | -------------|--------|----------|-------------------|
-| latest         | 11           | Alpine | Hotspot  | amd64             |
-| java8          | 8            | Alpine | Hotspot  | amd64             |
-| java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
-| java15         | 15           | Debian | Hotspot  | amd64,arm64,armv7 |
-| adopt11        | 11           | Alpine | Hotspot  | amd64             |
-| openj9         | 8            | Alpine | OpenJ9   | amd64             |
-| openj9-11      | 11           | Alpine | OpenJ9   | amd64             |
-| multiarch      | 11           | Debian | Hotspot  | amd64,arm64,armv7 |
-| multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
+| Tag name       | Description                                 | Linux        |
+| -------------- | ------------------------------------------- | ------------ |
+| latest         | **Default**. Uses Java version 8 update 212 | Alpine Linux |
+| adopt13        | Uses Java version 13 latest update          | Alpine Linux |
+| adopt11        | Uses Java version 11 latest update          | Alpine Linux |
+| openj9         | Uses Eclipse OpenJ9 JVM                     | Alpine Linux |
+| openj9-nightly | Uses Eclipse OpenJ9 JVM testing builds      | Alpine Linux |
+| multiarch      | Uses Java version 8 latest update           | Debian Linux |

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

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

-> 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.
-
-### Deprecated Image Tags
-
-The following image tags have been deprecated and are no longer receiving updates:
- adopt13
- adopt14
- adopt15
- openj9-nightly
+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.

 ## Healthcheck

@@ -206,22 +178,22 @@ healthy

 Some orchestration systems, such as Portainer, don't allow for disabling the default `HEALTHCHECK` declared by this image. In those cases you can approximate the disabling of healthchecks by setting the environment variable `DISABLE_HEALTHCHECK` to `true`.

-## Autopause
+## Autopause (experimental)

 ### Description

+> EXPERIMENTAL: this feature only works with default bridge networking using official Docker distributions. Host networking and container management software, such as Portainer, and NAS solutions do not seem to provide compatible networking.
+
 There are various bug reports on [Mojang](https://bugs.mojang.com) about high CPU usage of servers with newer versions, even with few or no clients connected (e.g. [this one](https://bugs.mojang.com/browse/MC-149018), in fact the functionality is based on [this comment in the thread](https://bugs.mojang.com/browse/MC-149018?focusedCommentId=593606&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-593606)).

 An autopause functionality has been added to this image to monitor whether clients are connected to the server. If for a specified time no client is connected, the Java process is stopped. When knocking on the server port (e.g. by the ingame Multiplayer server overview), the process is resumed. The experience for the client does not change.

 Of course, even loaded chunks are not ticked when the process is stopped.

-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 correctly. Non-vanilla versions might have their own configuration file, you might have to disable their watchdogs separately (e.g. PAPER Servers).
+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 correctly.

 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.

-The utility used to wake the server (`knock(d)`) works at network interface level. So the correct interface has to be set using the `AUTOPAUSE_KNOCK_INTERFACE` variable when using non-default networking environments (e.g. host-networking, Portainer oder NAS solutions). See the description of the variable below.
-
 A starting, example compose file has been provided in [examples/docker-compose-autopause.yml](examples/docker-compose-autopause.yml).

 ### Enabling Autopause
@@ -232,7 +204,7 @@ Enable the Autopause functionality by setting:
 -e ENABLE_AUTOPAUSE=TRUE
 ```

-The following environment variables define the behaviour of auto-pausing:
+There are 4 more environment variables that define the behaviour:
 * `AUTOPAUSE_TIMEOUT_EST`, default `3600` (seconds)
 describes the time between the last client disconnect and the pausing of the process (read as timeout established)
 * `AUTOPAUSE_TIMEOUT_INIT`, default `600` (seconds)
@@ -241,8 +213,6 @@ describes the time between server start and the pausing of the process, when no
 describes the time between knocking of the port (e.g. by the main menu ping) and the pausing of the process, when no client connects inbetween (read as timeout knocked)
 * `AUTOPAUSE_PERIOD`, default `10` (seconds)
 describes period of the daemonized state machine, that handles the pausing of the process (resuming is done independently)
-* `AUTOPAUSE_KNOCK_INTERFACE`, default `eth0`
-<br>Describes the interface passed to the `knockd` daemon. If the default interface does not work, run the `ifconfig` command inside the container and derive the interface receiving the incoming connection from its output. The passed interface must exist inside the container. Using the loopback interface (`lo`) does likely not yield the desired results.

 ## Deployment Templates and Examples

@@ -255,19 +225,14 @@ describes period of the daemonized state machine, that handles the pausing of th

 The [examples directory](https://github.com/itzg/docker-minecraft-server/tree/master/examples) also provides examples of deploying the [itzg/minecraft-server](https://hub.docker.com/r/itzg/minecraft-server/) Docker image.

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

-Enable [Forge server](http://www.minecraftforge.net/wiki/) mode by adding a `-e TYPE=FORGE` to your command-line.
-
-The overall version is specified by `VERSION`, [as described in the section above](#versions) and will run the recommended Forge version by default. You can also choose to run a specific Forge version with `FORGEVERSION`, such as `-e FORGEVERSION=14.23.5.2854`.
+Enable Forge server mode by adding a `-e TYPE=FORGE` to your command-line.
+By default the container will run the `RECOMMENDED` version of [Forge server](http://www.minecraftforge.net/wiki/)
+but you can also choose to run a specific version with `-e FORGEVERSION=10.13.4.1448`.

    $ docker run -d -v /path/on/host:/data \
-        -e TYPE=FORGE \
-        -e VERSION=1.12.2 -e FORGEVERSION=14.23.5.2854 \
+        -e TYPE=FORGE -e FORGEVERSION=10.13.4.1448 \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

 To use a pre-downloaded Forge installer, place it in the attached `/data` directory and
@@ -304,20 +269,10 @@ the `/path/on/host` folder contents look like:
 ├── ops.json
 ├── server.properties
 ├── whitelist.json
-├── worlds
-│   └── ... PLACE MAPS IN THEIR OWN FOLDERS HERE ...
 └── ...
 ```

-Providing a presistent `/data` mount is a good idea, both to persist the game world and to allow for the manual configuration which is sometimes needed.
-
-For instance, imagine a scenario when the initial launch has completed, but you now want to change the worldmap for your server.  
-
-Assuming you have a shared directory to your container, you can then (after first launch) drag and drop your premade maps or worlds into the `\worlds\` directory.  **Note:** each world should be placed in its own folder under the `\worlds\` directory.  
-
-Once your maps are in the proper path, you can then specify which map the server uses by changing the `level-name` value in `server.properties` to match the name of your map.
-
-If you add mods or make changes to `server.properties` while the container is running, you'll need to restart it to pick those
+If you add mods while the container is running, you'll need to restart it to pick those
 up:

    docker stop mc
@@ -330,18 +285,12 @@ or downloading a world with the `WORLD` option.

 There are two additional volumes that can be mounted; `/mods` and `/config`.
 Any files in either of these filesystems will be copied over to the main
-`/data` filesystem before starting Minecraft. If you want old mods to be removed as the `/mods` content is updated, then add `-e REMOVE_OLD_MODS=TRUE`. If you are running a `BUKKIT` distribution this will affect all files inside the `plugins/` directory. You can fine tune the removal process by specifing 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 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.
+`/data` filesystem before starting Minecraft.

 This works 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.

-You can specify the destination of the configs that are located inside the `/config` mount by setting the `COPY_CONFIG_DEST` variable. The configs are copied recursivly to the `/data/config` directory by default. If a file was updated directly inside the `/data/*` directoy and is newer than the file in the `/config/*` mount it will not be overriden.
-
-> For example: `-v ./config:/config -e COPY_CONFIG_DEST=/data` will allow you to copy over your `bukkit.yml` and so on directly into the server directory.
-
 ### Replacing variables inside configs

 Sometimes you have mods or plugins that require configuration information that is only available at runtime.
@@ -375,13 +324,7 @@ There are some limitations to what characters you can use.
 Variables will be replaced in files with the following extensions:
 `.yml`, `.yaml`, `.txt`, `.cfg`, `.conf`, `.properties`.

-Specific files can be excluded by listing their name (without path) in the variable `REPLACE_ENV_VARIABLES_EXCLUDES`.
-
-Paths can be excluded by listing them in the variable `REPLACE_ENV_VARIABLES_EXCLUDE_PATHS`. Path
-excludes are recursive. Here is an example:
-```
-REPLACE_ENV_VARIABLES_EXCLUDE_PATHS="/data/plugins/Essentials/userdata /data/plugins/MyPlugin"
-```
+Specific files can be excluded by listing their name (without path) in the variable `REPLACE_ENV_VARIABLES_EXCLUDES`. Paths can be excluded by listing them in the variable `REPLACE_ENV_VARIABLES_EXCLUDE_PATHS`.

 Here is a full example where we want to replace values inside a `database.yml`.

@@ -441,7 +384,7 @@ secrets:
 The content of `db_password`:

    ug23u3bg39o-ogADSs
-    
+
 ## Running a Bukkit/Spigot server

 Enable Bukkit/Spigot server mode by adding a `-e TYPE=BUKKIT` or `-e TYPE=SPIGOT` to your command-line.
@@ -459,9 +402,9 @@ You can build spigot from source by adding `-e BUILD_FROM_SOURCE=true`

 If you have attached a host directory to the `/data` volume, then you can install plugins within the `plugins` subdirectory. You can also [attach a `/plugins` volume](#deploying-plugins-from-attached-volume). If you add plugins while the container is running, you'll need to restart it to pick those up.

-## Running a Paper server
+## Running a PaperSpigot server

-Enable Paper server mode by adding a `-e TYPE=PAPER` to your command-line.
+Enable PaperSpigot server mode by adding a `-e TYPE=PAPER` to your command-line.

 By default the container will run the latest build of [Paper server](https://papermc.io/downloads)
 but you can also choose to run a specific build with `-e PAPERBUILD=205`.
@@ -470,7 +413,7 @@ but you can also choose to run a specific build with `-e PAPERBUILD=205`.
        -e TYPE=PAPER \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

-If you are hosting your own copy of Paper you can override the download URL with:
+If you are hosting your own copy of PaperSpigot you can override the download URL with:

 - -e PAPER_DOWNLOAD_URL=<url>

@@ -515,12 +458,12 @@ A [Catserver](http://catserver.moe/) type server can be used with

 ## 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).
+> **NOTE** requires `itzg/minecraft-server:multiarch` image

 [Feed the Beast application](https://www.feed-the-beast.com/) modpacks are supported by using `-e TYPE=FTBA` (**note** the "A" at the end of the type). This server type will automatically take care of downloading and installing the modpack and appropriate version of Forge, so the `VERSION` does not need to be specified.

 ### Environment Variables:
- `FTB_MODPACK_ID`: **required**, the numerical ID of the modpack to install. The ID can be located by [finding the modpack](https://www.feed-the-beast.com/modpack) and using the "ID" displayed next to the name
+- `FTB_MODPACK_ID`: **required**, the numerical ID of the modpack to install. The ID can be located by finding the modpack at [Neptune FTB](https://ftb.neptunepowered.org/) and using the "Pack ID"
 - `FTB_MODPACK_VERSION_ID`: optional, the numerical Id of the version to install. If not specified, the latest version will be installed. The "Version ID" can be obtained by drilling into the Versions tab and clicking a specific version.

 ### Upgrading
@@ -564,16 +507,6 @@ 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
-
-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
-
-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`.
-
 ### Fixing "unable to launch forgemodloader"

 If your server's modpack fails to load with an error [like this](https://support.feed-the-beast.com/t/cant-start-crashlanding-server-unable-to-launch-forgemodloader/6028/2):
@@ -601,31 +534,29 @@ Just change it with `SPONGEBRANCH`, such as:

 ## Running a Fabric Server

-Enable [Fabric server](http://fabricmc.net/use/) mode by adding a `-e TYPE=FABRIC` to your command-line. By default, the container will run the latest version, but you can also choose to run a specific version with `VERSION`.
+Enable Fabric server mode by adding a `-e TYPE=FABRIC` to your command-line.
+By default the container will run the latest version of [Fabric server](http://fabricmc.net/use/)
+but you can also choose to run a specific version with `-e FABRICVERSION=0.5.0.32`.

-```
-docker run -d -v /path/on/host:/data \
-    -e TYPE=FABRIC \
-    -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
-```
+    $ docker run -d -v /path/on/host:/data \
+        -e TYPE=FABRIC -e FABRICVERSION=0.5.0.32 \
+        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

-A specific installer version can be requested using `FABRIC_INSTALLER_VERSION`. 
+To use a pre-downloaded Fabric installer, place it in the attached `/data` directory and
+specify the name of the installer file with `FABRIC_INSTALLER`, such as:

-To use a pre-downloaded Fabric installer, place it in a directory attached into the container, such as the `/data` volume and specify the name of the installer file with `FABRIC_INSTALLER`, such as:
+    $ docker run -d -v /path/on/host:/data ... \
+        -e FABRIC_INSTALLER=fabric-installer-0.5.0.32.jar ...

-```
-docker run -d -v /path/on/host:/data ... \
-    -e FABRIC_INSTALLER=fabric-installer-0.5.0.32.jar ...
-```
+To download a Fabric installer from a custom location, such as your own file repository, specify
+the URL with `FABRIC_INSTALLER_URL`, such as:

-To download a Fabric installer from a custom location, such as your own file repository, specify the URL with `FABRIC_INSTALLER_URL`, such as:
+    $ docker run -d -v /path/on/host:/data ... \
+        -e FORGE_INSTALLER_URL=http://HOST/fabric-installer-0.5.0.32.jar ...

-```
-docker run -d -v /path/on/host:/data ... \
-    -e FABRIC_INSTALLER_URL=http://HOST/fabric-installer-0.5.0.32.jar ...
-```
+In both of the cases above, there is no need for the `VERSION` or `FABRICVERSION` variables.

-In order to add mods, you have two options:
+In order to add mods, you have two options.

 ### Using the /data volume

@@ -776,18 +707,12 @@ To whitelist players for your Minecraft server, pass the Minecraft usernames sep

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

-> NOTE: When `WHITELIST` is used the server property `white-list` will automatically get set to `true`.
-
-> 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.
-
 ### 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

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

-> By default, the players in `OPS` are **added** to the final `ops.json` file by the Minecraft server. If you set `OVERRIDE_OPS` to "true" then the `ops.json` file will be recreated on each server startup.
-
 ### Server icon

 A server icon can be configured using the `ICON` variable. The image will be automatically
@@ -795,10 +720,6 @@ downloaded, scaled, and converted from any other image format:

    docker run -d -e ICON=http://..../some/image.png ...

-The server icon which has been set doesn't get overridden by default. It can be changed and overridden by setting `OVERRIDE_ICON` to `TRUE`.
-
-    docker run -d -e ICON=http://..../some/other/image.png -e OVERRIDE_ICON=TRUE...
-
 ### Rcon

 To use rcon use the `ENABLE_RCON` and `RCON_PASSORD` variables.
@@ -965,7 +886,7 @@ environment variable set to `false`, such as
 ### Level Type and Generator Settings

 By default, a standard world is generated with hills, valleys, water, etc. A different level type can
-be configured by setting `LEVEL_TYPE` to an expected type, for example
+be configured by setting `LEVEL_TYPE` to an expected type, such as

 - DEFAULT
 - FLAT
@@ -973,8 +894,6 @@ be configured by setting `LEVEL_TYPE` to an expected type, for example
 - AMPLIFIED
 - CUSTOMIZED
 - BUFFET
- BIOMESOP (Biomes O' Plenty for 1.12 and older)
- BIOMESOPLENTY (Biomes O' Plenty for 1.15 and above)

 Descriptions are available at the [gamepedia](http://minecraft.gamepedia.com/Server.properties).

@@ -1105,18 +1024,19 @@ is passed to `docker run`.

 ### Memory Limit

-By default, the image declares an initial and maximum Java memory-heap limit of 1 GB. There are several ways to adjust the memory settings:
+By default, the image declares a Java initial and maximum memory limit of 1 GB. There are several
+ways to adjust the memory settings:

- `MEMORY`: "1G" by default, can be used to adjust both initial (`Xms`) and max (`Xmx`) memory heap settings of the JVM
- `INIT_MEMORY`: independently sets the initial heap size
- `MAX_MEMORY`: independently sets the max heap size
+- `MEMORY`, "1G" by default, can be used to adjust both initial (`Xms`) and max (`Xmx`)
+  memory settings of the JVM
+- `INIT_MEMORY`, independently sets the initial heap size
+- `MAX_MEMORY`, independently sets the max heap size

-The values of all three are passed directly to the JVM and support format/units as `<size>[g|G|m|M|k|K]`. For example:
+The values of all three are passed directly to the JVM and support format/units as
+`<size>[g|G|m|M|k|K]`. For example:

    -e MEMORY=2G

-> NOTE: the settings above only set the Java **heap** limits. Memory resource requests and limits on the overall container should also account for non-heap memory usage. An extra 25% is [a general best practice](https://dzone.com/articles/best-practices-java-memory-arguments-for-container).
-
 ### JVM Options

 General JVM options can be passed to the Minecraft Server invocation by passing a `JVM_OPTS`
@@ -1126,6 +1046,14 @@ via a `JVM_XX_OPTS` environment variable.
 For some cases, if e.g. after removing mods, it could be necessary to startup minecraft with an additional `-D` parameter like `-Dfml.queryResult=confirm`. To address this you can use the environment variable `JVM_DD_OPTS`, which builds the params from a given list of values separated by space, but without the `-D` prefix. To make things running under systems (e.g. Plesk), which doesn't allow `=` inside values, a `:` (colon) could be used instead. The upper example would look like this:
 `JVM_DD_OPTS=fml.queryResult:confirm`, and will be converted to `-Dfml.queryResult=confirm`.

+The container uses [OpenJ9](https://www.eclipse.org/openj9/docs) and a couple of J9 options are
+simplified by environment variables:
+
+- `-e TUNE_VIRTUALIZED=TRUE` : enables the option to 
+  [optimize for virtualized environments](https://www.eclipse.org/openj9/docs/xtunevirtualized/)
+- `-e TUNE_NURSERY_SIZES=TRUE` : configures nursery sizes where the initial size is 50%
+  of the `MAX_MEMORY` and the max size is 80%.
+
 ### Enable Remote JMX for Profiling

 To enable remote JMX, such as for profiling with VisualVM or JMC, add the environment variable `ENABLE_JMX=true` and add a port forwarding of TCP port 7091, such as:
@@ -1161,10 +1089,6 @@ Some older versions (pre-1.14) of Spigot required `--noconsole` to be passed whe
 Some older servers get confused and think that the GUI interface is enabled. You can explicitly
 disable that by passing `-e GUI=FALSE`.

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

 To run this image on a RaspberryPi 3 B+, 4, or newer, use the image tag
--- a/docker-versions-create.sh
+++ b/docker-versions-create.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #set -x
 # Use this variable to indicate a list of branches that docker hub is watching
-branches_list=('java8' 'java8-multiarch' 'openj9' 'openj9-11' 'adopt11' 'java15' 'multiarch' 'multiarch-latest')
+branches_list=('openj9' 'openj9-nightly' 'adopt11' 'adopt13' 'multiarch')

 function TrapExit {
  echo "Checking out back in master"
--- a/docs/start-script-flow.drawio.png
+++ b/docs/start-script-flow.drawio.png
--- a/examples/docker-compose-simple.yml
+++ b/examples/docker-compose-simple.yml
@@ -1,12 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    ports:
-      - 25565:25565
-    environment:
-      EULA: "TRUE"
-    volumes:
-      # attach the relative directory 'data' to the container's /data path
-      ./data:/data
--- a/examples/modpacks/README.md
+++ b/examples/modpacks/README.md
@@ -1,3 +1,3 @@
-Place server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.
+Please server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.

 The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/2787018>.
--- a/files/autopause/autopause-daemon.sh
+++ b/files/autopause/autopause-daemon.sh
@@ -2,48 +2,23 @@

 . /autopause/autopause-fcns.sh

-. ${SCRIPTS:-/}start-utils
+. /start-utils

-
-autopause_error_loop() {
-  logAutopause "Available interfaces within the docker container:"
-  INTERFACES=$(echo /sys/class/net/*)
-  INTERFACES=${INTERFACES//\/sys\/class\/net\//}
-  logAutopause "  $INTERFACES"
-  logAutopause "Please set the environment variable AUTOPAUSE_KNOCK_INTERFACE to the interface that handles incoming connections."
-  logAutopause "If unsure which interface to choose, run the ifconfig command in the container."
-  logAutopause "Autopause failed to initialize. This log entry will be printed every 30 minutes."
+sudo /usr/sbin/knockd -c /autopause/knockd-config.cfg -d
+if [ $? -ne 0 ] ; then
  while :
  do
-    sleep 1800
-    logAutopause "Autopause failed to initialize."
+    if [[ -n $(ps -o comm | grep java) ]] ; then
+      break
+    fi
+    sleep 0.1
  done
-}
-
-# wait for java process to be started
-while :
-do
-  if java_process_exists ; then
-    break
-  fi
-  sleep 0.1
-done
-
-# check for interface existence
-if [[ -z "$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
-  logAutopause "AUTOPAUSE_KNOCK_INTERFACE variable must not be empty!"
-  autopause_error_loop
-fi
-if ! [[ -d "/sys/class/net/$AUTOPAUSE_KNOCK_INTERFACE" ]] ; then
-  logAutopause "Selected interface \"$AUTOPAUSE_KNOCK_INTERFACE\" does not exist!"
-  autopause_error_loop
-fi
-
-sudo /usr/sbin/knockd -c /tmp/knockd-config.cfg -d -i "$AUTOPAUSE_KNOCK_INTERFACE"
-if [ $? -ne 0 ] ; then
  logAutopause "Failed to start knockd daemon."
-  logAutopause "Probable cause: Unable to attach to interface \"$AUTOPAUSE_KNOCK_INTERFACE\"."
-  autopause_error_loop
+  logAutopause "Possible cause: docker's host network mode."
+  logAutopause "Recreate without host mode or disable autopause functionality."
+  logAutopause "Stopping server."
+  killall -SIGTERM java
+  exit 1
 fi

 STATE=INIT
--- a/files/autopause/autopause-fcns.sh
+++ b/files/autopause/autopause-fcns.sh
@@ -8,16 +8,12 @@ java_running() {
  [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]]
 }

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

 mc_server_listening() {
-  [[ -n $(netstat -tln | grep -e "0.0.0.0:$SERVER_PORT" -e ":::$SERVER_PORT" | grep LISTEN) ]]
+  [[ -n $(netstat -tln | grep "0.0.0.0:$SERVER_PORT" | grep LISTEN) ]]
 }

 java_clients_connected() {
@@ -33,7 +29,7 @@ java_clients_connected() {
  # 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
+    if [[ ! $(echo "${connections[$i]}" | awk '{print $5}') =~ ^\s*127\.0\.0\.1:.*$ ]] ; then
      # not localhost
      return 0
    fi
--- a/files/autopause/pause.sh
+++ b/files/autopause/pause.sh
@@ -17,5 +17,5 @@ if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^S.*$ ]] ; th

  # finally pause the process
  logAutopauseAction "Pausing Java process"
-  pkill -STOP java
+  killall -q -STOP java
 fi
--- a/files/autopause/resume.sh
+++ b/files/autopause/resume.sh
@@ -4,5 +4,5 @@

 if [[ $( ps -a -o stat,comm | grep 'java' | awk '{ print $1 }') =~ ^T.*$ ]] ; then
  logAutopauseAction "Knocked, resuming Java process"
-  pkill -CONT java
+  killall -q -CONT java
 fi
--- a/files/sudoers-mc
+++ b/files/sudoers-mc
@@ -1,2 +1,2 @@
-%minecraft ALL=(ALL) NOPASSWD:/usr/bin/pkill
+%minecraft ALL=(ALL) NOPASSWD:/usr/bin/killall
 %minecraft ALL=(ALL) NOPASSWD:/usr/sbin/knockd
--- a/5
+++ b/5
@@ -36,6 +36,11 @@ if [ $(id -u) = 0 ]; then
    chown -R ${runAsUser}:${runAsGroup} /data
  fi

+  if [[ $(stat -c "%u" /autopause) != $UID ]]; then
+    log "Changing ownership of /autopause to $UID ..."
+    chown -R ${runAsUser}:${runAsGroup} /autopause
+  fi
+
  if [[ ${SKIP_NSSWITCH_CONF^^} != TRUE ]]; then
    echo 'hosts: files dns' > /etc/nsswitch.conf
  fi
--- a/23
+++ b/23
@@ -4,20 +4,18 @@

 log "Autopause functionality enabled"

-cp /autopause/knockd-config.cfg /tmp/knockd-config.cfg
-
 # update server port to listen to
 regseq="^\s*sequence\s*=\s*$SERVER_PORT\s*$"
-linenum=$(grep -nm1 sequence /tmp/knockd-config.cfg | cut -d : -f 1 | tail -n1)
-if ! [[ $(awk "NR==$linenum" /tmp/knockd-config.cfg) =~ $regseq ]]; then
-  sed -i "${linenum}s/sequence.*/sequence = $SERVER_PORT/" /tmp/knockd-config.cfg
+linenum=$(grep -nm1 sequence /autopause/knockd-config.cfg | cut -d : -f 1 | tail -n1)
+if ! [[ $(awk "NR==$linenum" /autopause/knockd-config.cfg) =~ $regseq ]]; then
+  sed -i "${linenum}s/sequence.*/sequence = $SERVER_PORT/" /autopause/knockd-config.cfg
  log "Updated server port in knockd config"
 fi
 # update rcon port to listen to
 regseq="^\s*sequence\s*=\s*$RCON_PORT\s*$"
-linenum=$(grep -nm2 sequence /tmp/knockd-config.cfg | cut -d : -f 1 | tail -n1)
-if ! [[ $(awk "NR==$linenum" /tmp/knockd-config.cfg) =~ $regseq ]]; then
-  sed -i "${linenum}s/sequence.*/sequence = $RCON_PORT/" /tmp/knockd-config.cfg
+linenum=$(grep -nm2 sequence /autopause/knockd-config.cfg | cut -d : -f 1 | tail -n1)
+if ! [[ $(awk "NR==$linenum" /autopause/knockd-config.cfg) =~ $regseq ]]; then
+  sed -i "${linenum}s/sequence.*/sequence = $RCON_PORT/" /autopause/knockd-config.cfg
  log "Updated rcon port in knockd config"
 fi

@@ -46,15 +44,10 @@ if ! [[ $AUTOPAUSE_TIMEOUT_INIT =~ ^[0-9]+$ ]] ; then
  export AUTOPAUSE_TIMEOUT_INIT
  log "Warning: AUTOPAUSE_TIMEOUT_INIT is not numeric, set to 600 (seconds)"
 fi
-if [[ "$AUTOPAUSE_KNOCK_INTERFACE" == "lo" ]] ; then
-  log "Warning: AUTOPAUSE_KNOCK_INTERFACE is set to the local loopback interface."
-  log "         This is not advisable, as incoming connections are likely not picked up there."
-  log "         Continuing with this setting."
-fi

-if [[ -n "$MAX_TICK_TIME" && "$MAX_TICK_TIME" != "-1" ]] ; then
+if [[ -n $MAX_TICK_TIME ]] ; then
  log "Warning: MAX_TICK_TIME is non-default, for autopause to work properly, this check should be disabled (-1 for versions >= 1.8.1)"
-elif [[ -z "$MAX_TICK_TIME" ]] ; then
+else
  if versionLessThan 1.8.1; then
    # 10 years
    MAX_TICK_TIME=315360000000
--- a/42
+++ b/42
@@ -8,7 +8,8 @@ shopt -s nullglob
 export HOME=/data

 if [ ! -e /data/eula.txt ]; then
-  if ! isTrue "$EULA"; then
+  EULA="${EULA,,}"
+  if [ "$EULA" != "true" ]; then
    log ""
    log "Please accept the Minecraft EULA at"
    log "  https://account.mojang.com/documents/minecraft_eula"
@@ -18,7 +19,12 @@ if [ ! -e /data/eula.txt ]; then
    exit 1
  fi

-  writeEula
+  echo "# Generated via Docker on $(date)" > /data/eula.txt
+
+  if ! echo "eula=$EULA" >> /data/eula.txt; then
+    log "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
+    exit 2
+  fi
 fi


@@ -39,22 +45,6 @@ if [[ $PROXY ]]; then
    sleep 5
 fi

-if [[ $RCON_PASSWORD_FILE ]]; then
-    log ""
-    if [ ! -e ${RCON_PASSWORD_FILE} ]; then
-	log "Initial RCON password file ${RCON_PASSWORD_FILE} does not seems to exist."
-	log "Please ensure your configuration."
-	log "If you are using Docker Secrets feature, please check this for further information: "
-	log " https://docs.docker.com/engine/swarm/secrets"
-	log ""
-	exit 1
-    else
-	RCON_PASSWORD=$(cat ${RCON_PASSWORD_FILE})
-	export RCON_PASSWORD
-    fi
-    log ""
-fi
-
 export SERVER_PROPERTIES=/data/server.properties
 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json

@@ -65,9 +55,12 @@ case "X$VERSION" in
  XSNAPSHOT|Xsnapshot)
    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot')
  ;;
-  *)
+  X[1-9]*)
    VANILLA_VERSION=$VERSION
  ;;
+  *)
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
+  ;;
 esac
 export VANILLA_VERSION
 log "Resolved version given ${VERSION} into ${VANILLA_VERSION}"
@@ -95,10 +88,6 @@ case "${TYPE^^}" in
  ;;

  FORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;

@@ -107,7 +96,7 @@ case "${TYPE^^}" in
  ;;

  FTB|CURSEFORGE)
-    exec ${SCRIPTS:-/}start-deployCF "$@"
+    exec ${SCRIPTS:-/}start-deployFTB "$@"
  ;;

  VANILLA)
@@ -140,9 +129,8 @@ case "${TYPE^^}" in

  *)
      log "Invalid type: '$TYPE'"
-      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
-      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA,"
-      log "         CUSTOM, MAGMA, MOHIST, CATSERVER"
+      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA, CURSEFORGE, SPONGEVANILLA,"
+      log "         CUSTOM, CURSE_INSTANCE, MAGMA, MOHIST, CATSERVER"
      exit 1
  ;;

--- a/54
+++ b/54
@@ -1,7 +1,6 @@
 #!/bin/bash

 . ${SCRIPTS:-/}start-utils
-isDebugging && set -x

 set -e

@@ -59,24 +58,12 @@ function downloadSpigot {
      ;;
  esac

-  if [[ ${VERSION^^} = LATEST ]]; then
-    VANILLA_VERSION=$(restify https://getbukkit.org/download/spigot --attribute='property=og:title' | jq -r '.[0] | .attributes | select(.property == "og:title") | .content | split(" ") | .[-1]')
-  fi
-
  if [[ -z $downloadUrl ]]; then
    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
  fi

-  setServerVar
-  if [ -f $SERVER ]; then
-    # tell curl to only download when newer
-    curlArgs="-z $SERVER"
-  fi
-  if isDebugging; then
-    curlArgs="$curlArgs -v"
-  fi
  log "Downloading $match from $downloadUrl ..."
-  curl -fsSL -o $SERVER $curlArgs "$downloadUrl"
+  curl -fsSL -o $SERVER "$downloadUrl"
  if [[ $? != 0 || $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
    cat <<EOF

@@ -85,13 +72,6 @@ ERROR: failed to download from $downloadUrl
       exact version, such as 1.4.6-R0.4-SNAPSHOT or 1.8-R0.1-SNAPSHOT-LATEST

 EOF
-
-    if isDebugging && [[ $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
-      cat $SERVER
-    fi
-
-    # remove invalid download
-    rm $SERVER
    exit 3
  fi

@@ -99,24 +79,22 @@ EOF
  export JVM_OPTS
 }

-function setServerVar {
-  case "$TYPE" in
-    *BUKKIT|*bukkit)
-      export SERVER=craftbukkit_server-${VANILLA_VERSION}.jar
-      ;;
-    *)
-      export SERVER=spigot_server-${VANILLA_VERSION}.jar
-      ;;
-  esac
-}

-if isTrue "$BUILD_SPIGOT_FROM_SOURCE" || isTrue "$BUILD_FROM_SOURCE"; then
-  setServerVar
-  if [ ! -f $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    buildSpigotFromSource
-  fi
-else
-  downloadSpigot
+case "$TYPE" in
+  *BUKKIT|*bukkit)
+    export SERVER=craftbukkit_server-${VANILLA_VERSION}.jar
+    ;;
+  *)
+    export SERVER=spigot_server-${VANILLA_VERSION}.jar
+    ;;
+esac
+
+if [ ! -f $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
+   if isTrue "$BUILD_SPIGOT_FROM_SOURCE" || isTrue "$BUILD_FROM_SOURCE"; then
+     buildSpigotFromSource
+   else
+     downloadSpigot
+   fi
 fi

 # Normalize on Spigot for operations below
--- a/6
+++ b/6
@@ -17,16 +17,12 @@ if isURL ${CUSTOM_SERVER}; then
  fi

 elif [[ -f ${CUSTOM_SERVER} ]]; then
-  export SERVER=${CUSTOM_SERVER}
-
-elif [[ ${GENERIC_PACK} ]]; then
-  log "Using custom server jar from generic pack at ${CUSTOM_SERVER} ..."
+  log "Using custom server jar at ${CUSTOM_SERVER} ..."
  export SERVER=${CUSTOM_SERVER}

 else
  log "CUSTOM_SERVER is not properly set to a URL or existing jar file"
  exit 2
-
 fi

 export SKIP_LOG4J_CONFIG=true
--- a/85
+++ b/85
@@ -1,83 +1,26 @@
 #!/bin/bash

-set -e
-
 . ${SCRIPTS:-/}start-utils
-isDebugging && set -x

-: ${FTB_BASE_DIR:=${CF_BASE_DIR:-/data/FeedTheBeast}}
-export FTB_BASE_DIR
-
-legacyJavaFixerUrl=https://ftb.forgecdn.net/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
+export FTB_BASE_DIR=/data/FeedTheBeast
+legacyJavaFixerUrl=http://ftb.cursecdn.com/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
 export TYPE=FEED-THE-BEAST

 FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}

 log "Looking for Feed-The-Beast / CurseForge server modpack."
-requireVar FTB_SERVER_MOD
-
-if ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
-  if ! [ -f "${FTB_SERVER_MOD}" ]; then
-    log "ERROR unable to find requested modpack file ${FTB_SERVER_MOD}"
+if [[ -z $FTB_SERVER_MOD ]]; then
+    log "Environment variable FTB_SERVER_MOD not set."
+    log "Set FTB_SERVER_MOD to the file name of the FTB server modpack."
+    log "(And place the modpack in the /data directory.)"
    exit 2
-  fi
-
-  needsInstall=true
-  installMarker=/data/.curseforge-installed
-  if [ -f $installMarker ]; then
-    if [ "$(cat $installMarker)" != "${FTB_SERVER_MOD}" ]; then
-      log "Upgrading modpack"
-
-      serverJar=$(find ${FTB_BASE_DIR} -not -name "forge*installer.jar" -name "forge*.jar")
-      if [[ "${serverJar}" ]]; then
-        rm -rf $(dirname "${serverJar}")/{mods,*.jar,libraries,resources,scripts,config}
-      fi
-    else
-      needsInstall=false
-    fi
-  fi
-
-  if $needsInstall; then
-    log "Unpacking FTB server modpack ${FTB_SERVER_MOD} ..."
-    mkdir -p ${FTB_BASE_DIR}
-    unzip -o "${FTB_SERVER_MOD}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
-
-    serverJar=$(find ${FTB_BASE_DIR}  -path "*/libraries/*" -prune -type f -o  -not -name "forge*installer.jar" -name "forge*.jar")
-    if [[ -z "$serverJar" ]]; then
-      forgeInstallerJar=$(find ${FTB_BASE_DIR} -name "forge*installer.jar")
-      if [[ -z "${forgeInstallerJar}" ]]; then
-        log "ERROR Unable to find forge installer in modpack."
-        log "      Make sure you downloaded the server files."
-        exit 2
-      fi
-
-      log "Installing forge server"
-      (cd $(dirname "${forgeInstallerJar}"); java -jar $(basename "${forgeInstallerJar}") --installServer) | awk '{printf "."} END {print ""}'
-    fi
-
-    echo "${FTB_SERVER_MOD}" > $installMarker
-  fi
-
-  export SERVER=$(find ${FTB_BASE_DIR}  -path "*/libraries/*" -prune -type f -o  -not -name "forge*installer.jar" -name "forge*.jar")
-  if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then
-    log "ERROR unable to locate installed forge server jar"
-    isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar"
-    exit 2
-  fi
-
-  export FTB_DIR=$(dirname "${SERVER}")
-
-  exec ${SCRIPTS:-/}start-finalSetupWorld $@
 fi

 entryScriptExpr="
  -name ServerStart.sh
-  -o -name serverstart.sh
  -o -name ServerStartLinux.sh
  -o -name LaunchServer.sh
  -o -name server-start.sh
-  -o -name startserver.sh
-  -o -name StartServer.sh
  "

 if [[ -d ${FTB_BASE_DIR} ]]; then
@@ -95,7 +38,7 @@ fi
 # this allows saving just the world separate from the rest of the data directory
 if [[ $startScriptCount = 0 ]]; then
  srv_modpack=${FTB_SERVER_MOD}
-  if isURL "${srv_modpack}"; then
+  if isURL ${srv_modpack}; then
      case $srv_modpack in
        https://www.feed-the-beast.com/*/download|https://www.curseforge.com/minecraft/modpacks/*/download/*/file)
          ;;
@@ -113,19 +56,19 @@ if [[ $startScriptCount = 0 ]]; then
      fi
      srv_modpack=$downloaded
  fi
-  if [[ "${srv_modpack:0:5}" == "data/" ]]; then
+  if [[ ${srv_modpack:0:5} == "data/" ]]; then
      # Prepend with "/"
-      srv_modpack="/${srv_modpack}"
+      srv_modpack=/${srv_modpack}
  fi
-  if [[ ! "${srv_modpack:0:1}" == "/" ]]; then
+  if [[ ! ${srv_modpack:0:1} == "/" ]]; then
      # If not an absolute path, assume file is in "/data"
      srv_modpack=/data/${srv_modpack}
  fi
-  if [[ ! -f "${srv_modpack}" ]]; then
+  if [[ ! -f ${srv_modpack} ]]; then
      log "FTB server modpack ${srv_modpack} not found."
      exit 2
  fi
-  if [[ ! "${srv_modpack: -4}" == ".zip" ]]; then
+  if [[ ! ${srv_modpack: -4} == ".zip" ]]; then
      log "FTB server modpack ${srv_modpack} is not a zip archive."
      log "Please set FTB_SERVER_MOD to a file with a .zip extension."
      exit 2
@@ -133,7 +76,7 @@ if [[ $startScriptCount = 0 ]]; then

  log "Unpacking FTB server modpack ${srv_modpack} ..."
  mkdir -p ${FTB_BASE_DIR}
-  unzip -o "${srv_modpack}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
+  unzip -o ${srv_modpack} -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
 fi

 if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
@@ -171,7 +114,7 @@ export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)

 export FTB_DIR=$(dirname "${FTB_SERVER_START}")
 chmod a+x "${FTB_SERVER_START}"
-grep fml.queryResult=confirm "${FTB_SERVER_START}" > /dev/null || \
+grep fml.queryResult=confirm ${FTB_SERVER_START} > /dev/null || \
    sed -i 's/-jar/-Dfml.queryResult=confirm -jar/' "${FTB_SERVER_START}"
 sed -i 's/.*read.*Restart now/#\0/' "${FTB_SERVER_START}"
 legacyJavaFixerPath="${FTB_DIR}/mods/legacyjavafixer.jar"
--- a/24
+++ b/24
@@ -7,34 +7,36 @@ export TYPE=FABRIC

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

-  FABRIC_INSTALLER="/tmp/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
-  markerVersion=$FABRIC_INSTALLER_VERSION
+  FABRIC_INSTALLER="/tmp/fabric-installer-$FABRIC_VERSION.jar"

 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}"
+installMarker="/data/.fabric-installed-${VANILLA_VERSION}-${FABRIC_VERSION:-manual}"

 debug Checking for installMarker ${installMarker}
 if [[ ! -e $installMarker ]]; then
  if [[ ! -e $FABRIC_INSTALLER ]]; then
    if [[ -z $FABRIC_INSTALLER_URL ]]; then
-      log "Downloading installer version $FABRIC_INSTALLER_VERSION"
-      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/${FABRIC_INSTALLER_VERSION}/fabric-installer-${FABRIC_INSTALLER_VERSION}.jar"
+      log "Downloading $FABRIC_VERSION"
+      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/$FABRIC_VERSION/fabric-installer-$FABRIC_VERSION.jar"
      log "...trying $downloadUrl"
      curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
    else
@@ -47,9 +49,9 @@ if [[ ! -e $installMarker ]]; then
  fi

  if isDebugging; then
-    debug "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
+    debug "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER with mcversion ${VANILLA_VERSION}"
  else
-    log "Installing Fabric using $FABRIC_INSTALLER"
+    log "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
  fi
  tries=3
  set +e
--- a/79
+++ b/79
@@ -1,78 +1,23 @@
 #!/bin/bash

 . ${SCRIPTS:-/}start-utils
-set -o pipefail
-isDebugging && set -x

-if [[ $PAPER_DOWNLOAD_URL ]]; then
-  export SERVER=$(getFilenameFromUrl "${PAPER_DOWNLOAD_URL}")
+: ${PAPERBUILD:=latest}
+export SERVER=paper_server-${VANILLA_VERSION}-${PAPERBUILD}.jar

-  if [ -f "$SERVER" ]; then
-    zarg=(-z "$SERVER")
-  fi
-
-  echo "Preparing custom PaperMC jar from $PAPER_DOWNLOAD_URL"
-
-  curl -fsSL -o "$SERVER" "${zarg[@]}" "${PAPER_DOWNLOAD_URL}"
-else
-  # PaperMC API v2 docs : https://papermc.io/api/docs/swagger-ui/index.html?configUrl=/api/openapi/swagger-config
-
-  build=${PAPERBUILD:=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}" -H  "accept: application/json" \
-   | jq '.builds[-1]')}
-  case $? in
-    0)
-      ;;
-    22)
-      versions=$(curl -fsSL "https://papermc.io/api/v2/projects/paper" -H  "accept: application/json")
-      if [[ $VERSION = LATEST ]]; then
-          VANILLA_VERSION=$(echo "$versions" | jq -r '.versions[-1]')
-          log "WARN: using ${VANILLA_VERSION} since that's the latest provided by PaperMC"
-          # re-execute the current script with the newly computed version
-          exec "$0" "$@"
-      fi
-      log "ERROR: ${VANILLA_VERSION} is not published by PaperMC"
-      log "       Set VERSION to one of the following: "
-      log "       $(echo "$versions" | jq -r '.versions | join(", ")')"
-      exit 1
-      ;;
-    *)
-      echo "ERROR: unknown error while looking up PaperMC version=${VANILLA_VERSION}"
-      exit 1
-      ;;
-  esac
-  if [ $? != 0 ]; then
-    echo "ERROR: failed to lookup PaperMC build from version ${VANILLA_VERSION}"
-    exit 1
-  fi
-
-  export SERVER=$(curl -fsSL "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}" -H  "accept: application/json" \
-   | jq -r '.downloads.application.name')
-  if [ $? != 0 ]; then
-    echo "ERROR: failed to lookup PaperMC download file from version=${VANILLA_VERSION} build=${build}"
-    exit 1
-  fi
-
-  if [ -f "$SERVER" ]; then
-    zarg=(-z "$SERVER")
-  fi
-
-  log "Removing old PaperMC versions ..."
-  paperJarSearchString=${SERVER/$build/[0-9]*}
-  find . -name "$paperJarSearchString" ! -name "$SERVER" -delete -print
-
-  log "Downloading PaperMC $VANILLA_VERSION (build $build) ..."
-  curl -fsSL -o "$SERVER" "${zarg[@]}" \
-    "https://papermc.io/api/v2/projects/paper/versions/${VANILLA_VERSION}/builds/${build}/downloads/${SERVER}" \
-    -H  "accept: application/java-archive"
-  if [ $? != 0 ]; then
-    echo "ERROR: failed to download PaperMC from version=${VANILLA_VERSION} build=${build} download=${SERVER}"
-    exit 1
-  fi
+if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
+    downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/${PAPERBUILD}/download}
+    log "Downloading Paper $VANILLA_VERSION (build $PAPERBUILD) 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 downstream operations
+# Normalize on Spigot for operations below
 export TYPE=SPIGOT
 export SKIP_LOG4J_CONFIG=true

 # Continue to Final Setup
-exec ${SCRIPTS:-/}start-finalSetupWorld "$@"
+exec ${SCRIPTS:-/}start-finalSetupWorld $@
--- a/3
+++ b/3
@@ -26,9 +26,6 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
  if [ $result != 0 ]; then
    log "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
    exit 1
-  elif [ $serverDownloadUrl = null ]; then
-    log "ERROR version $VANILLA_VERSION does not provide a server download"
-    exit 1
  fi

  debug "Downloading server from $serverDownloadUrl"
--- a/24
+++ b/24
@@ -7,20 +7,14 @@
 if isTrue "${REPLACE_ENV_VARIABLES}"; then
  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."

-  # File excludes
-  fileExcludes=
+  findExcludes=
  for f in ${REPLACE_ENV_VARIABLES_EXCLUDES}; do
-    fileExcludes="${fileExcludes} -not -name $f"
+    findExcludes="${findExcludes} -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 p in ${REPLACE_ENV_VARIABLES_EXCLUDE_PATHS}; do
+    findExcludes="${findExcludes} -not -path \"*$p*\""
+  done
+  isDebugging && echo "Using find exclusion: $findExcludes"

  while IFS='=' read -r name value ; do
    # check if name of env variable matches the prefix
@@ -35,12 +29,10 @@ if isTrue "${REPLACE_ENV_VARIABLES}"; then
      fi

      log "Replacing $name with $value ..."
-      find /data/ \
-          $dirExcludes \
-          -type f \
+      find /data/ -type f \
          \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" \
          -or -name "*.conf" -or -name "*.properties" \) \
-          $fileExcludes \
+          $findExcludes \
          -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
    fi
  done < <(env)
--- a/2
+++ b/2
@@ -24,4 +24,4 @@ case "X$MODCONFIG" in
 esac
 fi

-exec ${SCRIPTS:-/}start-finalSetupMounts $@
+exec ${SCRIPTS:-/}start-finalSetupPlugins $@
--- a/131
+++ b/131
@@ -1,109 +1,80 @@
 #!/bin/bash

-set -e -o pipefail
+set -e

 . ${SCRIPTS:-/}start-utils
-if isDebugging; then
-  set -x
-fi

 #  CURSE_URL_BASE used in manifest downloads below
 CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}

 # Remove old mods/plugins
-if isTrue ${REMOVE_OLD_MODS}; then
-  remove_mods_dest="/data/mods"
-  case ${TYPE} in
-    SPIGOT|BUKKIT|PAPER)
-      remove_mods_dest="/data/plugins"
-      ;;
-  esac
-
-  # only try to remove existing mods dir
-  if [ -d "$remove_mods_dest" ]; then
-    log "Removing old mods in $remove_mods_dest..."
-    find $remove_mods_dest -mindepth 1 -maxdepth ${REMOVE_OLD_MODS_DEPTH:-16} -wholename "${REMOVE_OLD_MODS_INCLUDE:-*}" -not -wholename "${REMOVE_OLD_MODS_EXCLUDE}" -delete
+if [ "$REMOVE_OLD_MODS" = "TRUE" ]; then
+  if [ "$TYPE" = "SPIGOT" ]; then
+    rm -rf /data/plugins/*
  else
-    log "Directory $remove_mods_dest does not exist; removing nothing."
+    rm -rf /data/mods/*
  fi
 fi

 # If supplied with a URL for a modpack (simple zip of jars), download it and unpack
 if [[ "$MODPACK" ]]; then
-  if isURL "${MODPACK}"; then
-    if [[ "${MODPACK}" == *.zip ]]; then
-      downloadUrl="${MODPACK}"
-    else
-      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 or HTTPS and a ZIP file"
-        exit 1
-      fi
-    fi
-
+EFFECTIVE_MODPACK_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MODPACK)
+case "X$EFFECTIVE_MODPACK_URL" in
+  X[Hh][Tt][Tt][Pp]*.zip)
    log "Downloading mod/plugin pack via HTTP"
-    log "  from $downloadUrl ..."
-    if ! curl -sSL -o /tmp/modpack.zip "$downloadUrl"; then
-      log "ERROR: failed to download from $downloadUrl"
+    log "  from $EFFECTIVE_MODPACK_URL ..."
+    if ! curl -sSL -o /tmp/modpack.zip "$EFFECTIVE_MODPACK_URL"; then
+      log "ERROR: failed to download from $EFFECTIVE_MODPACK_URL"
      exit 2
    fi

    if [ "$TYPE" = "SPIGOT" ]; then
      mkdir -p /data/plugins
      if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
-        log "ERROR: failed to unzip the modpack from $downloadUrl"
+        log "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
      fi
    else
      mkdir -p /data/mods
      if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-        log "ERROR: failed to unzip the modpack from $downloadUrl"
+        log "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
      fi
    fi
    rm -f /tmp/modpack.zip
-
-  else
-    log "ERROR Invalid URL given for MODPACK: $MODPACK"
-    exit 1
-  fi
+    ;;
+  *)
+    log "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
+    ;;
+esac
 fi

 # If supplied with a URL for a plugin download it.
 if [[ "$MODS" ]]; then
-  if [ "$TYPE" = "SPIGOT" ]; then
-    out_dir=/data/plugins
-  else
-    out_dir=/data/mods
-  fi
-  mkdir -p "$out_dir"
-
-  for i in ${MODS//,/ }
-  do
-    if isURL $i; then
-      log "Downloading mod/plugin $i ..."
-      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
+for i in ${MODS//,/ }
+do
+  EFFECTIVE_MOD_URL=$(curl -Ls -o /dev/null -w %{url_effective} $i)
+  case "X$EFFECTIVE_MOD_URL" in
+    X[Hh][Tt][Tt][Pp]*.jar)
+      log "Downloading mod/plugin via HTTP"
+      log "  from $EFFECTIVE_MOD_URL ..."
+      if ! curl -sSL -o /tmp/${EFFECTIVE_MOD_URL##*/} $EFFECTIVE_MOD_URL; then
+        log "ERROR: failed to download from $EFFECTIVE_MOD_URL to /tmp/${EFFECTIVE_MOD_URL##*/}"
+        exit 2
      fi
-    else
-      log "ERROR Invalid URL given in MODS: $i"
-      exit 2
-    fi
-  done
+
+      if [ "$TYPE" = "SPIGOT" ]; then
+        mkdir -p /data/plugins
+        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/plugins/${EFFECTIVE_MOD_URL##*/}
+      else
+        mkdir -p /data/mods
+        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/mods/${EFFECTIVE_MOD_URL##*/}
+      fi
+      rm -f /tmp/${EFFECTIVE_MOD_URL##*/}
+      ;;
+    *)
+      log "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
+      ;;
+  esac
+done
 fi

 if [[ "$MANIFEST" ]]; then
@@ -111,7 +82,7 @@ if [[ "$MANIFEST" ]]; then
        EFFECTIVE_MANIFEST_FILE=$MANIFEST
    elif isURL "$MANIFEST"; then
        EFFECTIVE_MANIFEST_FILE=/tmp/manifest.json
-        EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{effective_url} $MANIFEST)
+        EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MANIFEST)
        curl -Ls -o $EFFECTIVE_MANIFEST_FILE "$EFFECTIVE_MANIFEST_URL"
    else
        log "MANIFEST='$MANIFEST' is not a valid manifest url or location"
@@ -132,7 +103,7 @@ case "X$EFFECTIVE_MANIFEST_FILE" in
      do
        if [ ! -f $MOD_DIR/${p}_${f}.jar ]
        then
-          redirect_url="$(curl -Ls -o /dev/null -w %{effective_url} ${CURSE_URL_BASE}/${p})"
+          redirect_url="$(curl -Ls -o /dev/null -w %{url_effective} ${CURSE_URL_BASE}/${p})"
          url="$redirect_url/download/${f}/file"
          log Downloading curseforge mod $url
          #  Manifest usually doesn't have mod names. Using id should be fine, tho
@@ -151,17 +122,17 @@ fi

 if [[ "${GENERIC_PACK}" ]]; then
  if isURL "${GENERIC_PACK}"; then
-    log "Downloading generic pack ..."
-    curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"
-    GENERIC_PACK=/tmp/generic_pack.zip
+    generic_pack_url=${GENERIC_PACK}
+    GENERIC_PACK=/tmp/$(basename ${generic_pack_url})
+    log "Downloading generic pack from ${generic_pack_url} ..."
+    curl -fsSL -o ${GENERIC_PACK} ${generic_pack_url}
  fi

  sum_file=/data/.generic_pack.sum
  if ! sha256sum -c ${sum_file} -s 2> /dev/null; then
    base_dir=/tmp/generic_pack_base
    mkdir -p ${base_dir}
-    isDebugging && ls -l "${GENERIC_PACK}"
-    unzip -q -d ${base_dir} "${GENERIC_PACK}"
+    unzip -q -d ${base_dir} ${GENERIC_PACK}
    if [ -f /data/manifest.txt ]; then
      log "Manifest exists from older generic pack, cleaning up ..."
      while read f; do
@@ -179,7 +150,7 @@ if [[ "${GENERIC_PACK}" ]]; then
    for d in $(find ${base_dir} -type d); do mkdir -p "$(sed "s#${base_dir}#/data#" <<< $d)"; done
    for f in $(find ${base_dir} -type f); do cp -f "$f" "$(sed "s#${base_dir}#/data#" <<< $f)"; done
    rm -rf ${base_dir}
-    sha256sum "${GENERIC_PACK}" > ${sum_file}
+    sha256sum ${GENERIC_PACK} > ${sum_file}
  fi
 fi

--- a/38
+++ b/38
@@ -1,38 +0,0 @@
-#!/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
-if [ -d /mods ]; then
-  log "Copying any mods over..."
-  mkdir -p /data/mods
-  rsync -a --out-format="update:%f:Last Modified %M" "${rsyncArgs[@]}" --prune-empty-dirs --update /mods /data
-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/23
+++ b/23
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}start-utils
+
+: ${PLUGINS_SYNC_UPDATE:=true}
+
+isDebugging && set -x
+
+if [ -d /plugins ]; then
+  case ${TYPE} in
+    SPIGOT|BUKKIT|PAPER)
+      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
+
+exec ${SCRIPTS:-/}start-finalSetupServerProperties $@
--- a/2
+++ b/2
@@ -13,7 +13,7 @@ function setServerProp {
        var=${var,,} ;;
    esac
    log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
-    sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
+    sed -i "/^${prop}\s*=/ c ${prop}=${var}" "$SERVER_PROPERTIES"
  else
    log "Skip setting ${prop}"
  fi
--- a/12
+++ b/12
@@ -25,12 +25,7 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
    mkdir -p /tmp/world-data
    (cd /tmp/world-data && unzip -o -q "$zipSrc")

-    if [ "$TYPE" = "SPIGOT" ]; then
-      baseDirs=$(find /tmp/world-data -name "level.dat" -not -path "*_nether*" -not -path "*_the_end*" -exec dirname "{}" \;)
-    else
-      baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
-    fi
-
+    baseDirs=$(find /tmp/world-data -name "level.dat" -exec dirname "{}" \;)
    count=$(echo "$baseDirs" | wc -l)
    if [[ $count -gt 1 ]]; then
      baseDir="$(echo "$baseDirs" | sed -n ${WORLD_INDEX:-1}p)"
@@ -43,11 +38,6 @@ if [[ "$WORLD" ]] && ( isTrue "${FORCE_WORLD_COPY}" || [ ! -d "$worldDest" ] );
      exit 1
    fi
    rsync --remove-source-files --recursive --delete "$baseDir/" "$worldDest"
-    if [ "$TYPE" = "SPIGOT" ]; then
-      log "Copying end and nether ..."
-      [ -d "${baseDir}_nether" ] && rsync --remove-source-files --recursive --delete "${baseDir}_nether/" "${worldDest}_nether"
-      [ -d "${baseDir}_the_end" ] && rsync --remove-source-files --recursive --delete "${baseDir}_the_end/" "${worldDest}_the_end"
-    fi
  else
    log "Cloning world directory from $WORLD ..."
    rsync --recursive --delete "${WORLD%/}"/ "$worldDest"
--- a/142
+++ b/142
@@ -3,40 +3,28 @@
 . ${SCRIPTS:-/}start-utils

 if [ -n "$OPS" ]; then
-  log "Updating ops"
-  rm -f /data/ops.txt.converted
+  log "Setting/adding ops"
+  rm -rf /data/ops.txt.converted
  echo $OPS | awk -v RS=, '{print}' > /data/ops.txt
-
-  if isTrue "${OVERRIDE_OPS}"; then
-    log "Recreating ops.json file at server startup"
-    rm -f /data/ops.json
-  fi
 fi

 if [ -n "$WHITELIST" ]; then
-  log "Updating whitelist"
-  rm -f /data/white-list.txt.converted
+  log "Setting whitelist"
+  rm -rf /data/white-list.txt.converted
  echo $WHITELIST | awk -v RS=, '{print}' > /data/white-list.txt
-
-  if isTrue "${OVERRIDE_WHITELIST}"; then
-    log "Recreating whitelist.json file at server startup"
-    rm -f /data/whitelist.json
-  fi
 fi

-if [ -n "$ICON" ]; then
-    if [ ! -e server-icon.png ] || [ "${OVERRIDE_ICON}" == "TRUE" ]; then
-      log "Using server icon from $ICON..."
-      # Not sure what it is yet...call it "img"
-      curl -sSL -o /tmp/icon.img $ICON
-      specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
-      if [ "$specs" = "PNG 64x64" ]; then
-        mv /tmp/icon.img /data/server-icon.png
-      else
-        log "Converting image to 64x64 PNG..."
-        convert /tmp/icon.img -resize 64x64! /data/server-icon.png
-      fi
-    fi
+if [ -n "$ICON" -a ! -e server-icon.png ]; then
+  log "Using server icon from $ICON..."
+  # Not sure what it is yet...call it "img"
+  curl -sSL -o /tmp/icon.img $ICON
+  specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
+  if [ "$specs" = "PNG 64x64" ]; then
+    mv /tmp/icon.img /data/server-icon.png
+  else
+    log "Converting image to 64x64 PNG..."
+    convert /tmp/icon.img -resize 64x64! /data/server-icon.png
+  fi
 fi

 if ! isTrue ${SKIP_LOG4J_CONFIG}; then
@@ -61,6 +49,23 @@ for j in $JSON_FILES; do
  fi
 done

+
+# If any modules have been provided, copy them over
+if [ -d /mods ]; then
+  log "Copying any mods over..."
+  mkdir -p /data/mods
+  rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /mods /data
+fi
+
+[ -d /data/config ] || mkdir /data/config
+for c in /config/*
+do
+  if [ -f "$c" ]; then
+    log Copying configuration $(basename "$c")
+    cp -rf "$c" /data/config
+  fi
+done
+
 EXTRA_ARGS=""
 # Optional disable console
 if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
@@ -83,6 +88,23 @@ if [ -n "$JVM_DD_OPTS" ]; then
      done
 fi

+if isTrue ${TUNE_VIRTUALIZED}; then
+  JVM_XX_OPTS="${JVM_XX_OPTS} -Xtune:virtualized"
+fi
+
+if isTrue ${TUNE_NURSERY_SIZES}; then
+  case ${MAX_MEMORY^^} in
+    *G)
+      MAX_MEMORY_MB=$(( ${MAX_MEMORY%?} * 1024 )) ;;
+    *M)
+      MAX_MEMORY_MB=${MAX_MEMORY%?} ;;
+  esac
+
+  NURSERY_MINIMUM=$(( ${MAX_MEMORY_MB} / 2 ))
+  NURSERY_MAXIMUM=$(( ${MAX_MEMORY_MB} * 4/5 ))
+  JVM_XX_OPTS="${JVM_XX_OPTS} -Xmns${NURSERY_MINIMUM}M -Xmnx${NURSERY_MAXIMUM}M"
+fi
+
 if isTrue ${ENABLE_JMX}; then
  : ${JMX_HOST:=0.0.0.0}
  : ${JMX_PORT:=7091}
@@ -153,60 +175,49 @@ if isTrue "${DEBUG_MEMORY}"; then
  free -m
 fi

-JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
-
-function copyFilesForCurseForge() {
-  # copy player modification files unconditionally since their
-  # processing into json is additive anyway
-  [ -f /data/ops.txt ] && cp -f /data/ops.txt "${FTB_DIR}/"
-  [ -f /data/white-list.txt ] && cp -f /data/white-list.txt "${FTB_DIR}/"
-
-  if [ ! -e "${FTB_DIR}/server-icon.png" -a -e /data/server-icon.png ]; then
-    cp -f /data/server-icon.png "${FTB_DIR}/"
-  fi
-
-  cp -f /data/eula.txt "${FTB_DIR}/"
-}
-
-mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
+mcServerRunnerArgs="--stop-duration 60s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
+    JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
    if isTrue ${DEBUG_EXEC}; then
      set -x
    fi
    exec mc-server-runner ${mcServerRunnerArgs} \
      --cf-instance-file "${CURSE_INSTANCE_JSON}" \
      java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar _SERVERJAR_ "$@" $EXTRA_ARGS
-elif [[ ${TYPE} == "FEED-THE-BEAST" && "${SERVER}" ]]; then
-  copyFilesForCurseForge
-
-  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
 elif [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
-  mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"
+    mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"

-  copyFilesForCurseForge
+    if [ ! -e "${FTB_DIR}/ops.json" -a -e /data/ops.txt ]; then
+      cp -f /data/ops.txt ${FTB_DIR}/
+    fi

-  cat > "${FTB_DIR}/settings-local.sh" <<EOF
+    if [ ! -e "${FTB_DIR}/whitelist.json" -a -e /data/white-list.txt ]; then
+      cp -f /data/white-list.txt ${FTB_DIR}/
+    fi
+
+    if [ ! -e "${FTB_DIR}/server-icon.png" -a -e /data/server-icon.png ]; then
+      cp -f /data/server-icon.png ${FTB_DIR}/
+    fi
+
+    cp -f /data/eula.txt "${FTB_DIR}/"
+
+    cat > "${FTB_DIR}/settings-local.sh" <<EOF
 export MIN_RAM="${INIT_MEMORY}"
 export MAX_RAM="${MAX_MEMORY}"
 export JAVA_PARAMETERS="${JVM_XX_OPTS} -Xms${INIT_MEMORY} ${JVM_OPTS} $expandedDOpts"
 EOF

-  # patch CurseForge cfg file, if present
-  if [ -f "${FTB_DIR}/settings.cfg" ]; then
-    sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg"
-  fi
+    # patch CurseForge cfg file, if present
+    if [ -f "${FTB_DIR}/settings.cfg" ]; then
+      sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg"
+    fi

-  cd "${FTB_DIR}"
-  log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
-  if isTrue ${DEBUG_EXEC}; then
-    set -x
-  fi
-  exec mc-server-runner ${mcServerRunnerArgs} "${FTB_SERVER_START}"
+    cd "${FTB_DIR}"
+    log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
+    if isTrue ${DEBUG_EXEC}; then
+      set -x
+    fi
+    exec mc-server-runner ${mcServerRunnerArgs} "${FTB_SERVER_START}"
 else
  # If we have a bootstrap.txt file... feed that in to the server stdin
  if [ -f /data/bootstrap.txt ]; then
@@ -214,6 +225,7 @@ else
  fi

  log "Starting the Minecraft server..."
+  JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
  if isTrue ${DEBUG_EXEC}; then
    set -x
  fi
--- a/114
+++ b/114
@@ -1,14 +1,6 @@
 #!/bin/bash

-function join_by() {
-  local d=$1
-  shift
-  echo -n "$1"
-  shift
-  printf "%s" "${@/#/$d}"
-}
-
-function isURL() {
+function isURL {
  local value=$1

  if [[ ${value:0:8} == "https://" || ${value:0:7} == "http://" ]]; then
@@ -18,114 +10,90 @@ function isURL() {
  fi
 }

-function isValidFileURL() {
-  suffix=${1:?Missing required suffix arg}
-  url=${2:?Missing required url arg}
-
-  [[ "$url" == http*://*.${suffix} || "$url" == http*://*.${suffix}\?* ]]
-}
-
-function resolveEffectiveUrl() {
-  url="${1:?Missing required url argument}"
-  if ! curl -Ls -o /dev/null -w %{url_effective} "$url"; then
-    log "ERROR failed to resolve effective URL from $url"
-    exit 2
-  fi
-}
-
-function getFilenameFromUrl() {
-  url="${1:?Missing required url argument}"
-  strippedOfQuery="${url%\?*}"
-  basename "$strippedOfQuery"
-}
-
-function isTrue() {
+function isTrue {
  local value=${1,,}

  result=

  case ${value} in
-  true | on)
-    result=0
-    ;;
-  *)
-    result=1
-    ;;
+    true|on)
+      result=0
+      ;;
+    *)
+      result=1
+      ;;
  esac

  return ${result}
 }

-function isDebugging() {
-  if [[ -v DEBUG ]] && [[ ${DEBUG^^} == TRUE ]]; then
+function isDebugging {
+  if [[ -v DEBUG ]] && [[ ${DEBUG^^} = TRUE ]]; then
    return 0
  else
    return 1
  fi
 }

-function debug() {
+function debug {
  if isDebugging; then
    log "DEBUG: $*"
  fi
 }

-function logn() {
+function logn {
  echo -n "[init] $*"
 }

-function log() {
+function log {
  echo "[init] $*"
 }

-function logAutopause() {
+function logAutopause {
  echo "[Autopause loop] $*"
 }

-function logAutopauseAction() {
+function logAutopauseAction {
  echo "[$(date -Iseconds)] [Autopause] $*"
 }

-function normalizeMemSize() {
+function normalizeMemSize {
  local scale=1
  case ${1,,} in
-  *k)
-    scale=1024
-    ;;
-  *m)
-    scale=1048576
-    ;;
-  *g)
-    scale=1073741824
-    ;;
+    *k)
+      scale=1024;;
+    *m)
+      scale=1048576;;
+    *g)
+      scale=1073741824;;
  esac

-  val=${1:0:-1}
-  echo $((val * scale))
+  val=${1:0: -1}
+  echo $(( val * scale ))
 }

-function versionLessThan() {
+function versionLessThan {
  local activeParts
-  IFS=. read -ra activeParts <<<"${VANILLA_VERSION}"
+  IFS=. read -ra activeParts <<< "${VANILLA_VERSION}"

  local givenParts
-  IFS=. read -ra givenParts <<<"$1"
+  IFS=. read -ra givenParts <<< "$1"

-  if ((${#activeParts[@]} < 2)); then
+  if (( ${#activeParts[@]} < 2 )); then
    return 1
  fi

-  if ((${#activeParts[@]} == 2)); then
-    if ((activeParts[0] < givenParts[0])) ||
-      ((activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1])); then
+  if (( ${#activeParts[@]} == 2 )); then
+    if (( activeParts[0] < givenParts[0] )) || \
+      (( activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1] )); then
      return 0
    else
      return 1
    fi
  else
-    if ((activeParts[0] < givenParts[0])) ||
-      ((activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1])) ||
-      ((activeParts[0] == givenParts[0] && activeParts[1] == givenParts[1] && activeParts[2] < givenParts[2])); then
+    if (( activeParts[0] < givenParts[0] )) || \
+      (( activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1] )) || \
+      (( activeParts[0] == givenParts[0] && activeParts[1] == givenParts[1] && activeParts[2] < givenParts[2] )); then
      return 0
    else
      return 1
@@ -138,18 +106,4 @@ requireVar() {
    log "ERROR: $1 is required to be set"
    exit 1
  fi
-  if [ -z "${!1}" ]; then
-    log "ERROR: $1 is required to be set"
-    exit 1
-  fi
-}
-
-function writeEula() {
-  if ! echo "# Generated via Docker
-# $(date)
-eula=${EULA,,}
-" >/data/eula.txt; then
-    log "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
-    exit 2
-  fi
 }
--- a/tests/docker-compose.test.yml
+++ b/tests/docker-compose.test.yml
@@ -1,17 +0,0 @@
-version: "3.8"
-
-services:
-  sut:
-    depends_on:
-      - mc
-    image: itzg/mc-monitor:0.6.0
-    command: status --host mc --retry-interval 1s --retry-limit 120
-  mc:
-    restart: "no"
-    build:
-      context: ..
-      cache_from:
-      - itzg/minecraft-server:latest
-    environment:
-      EULA: "TRUE"
-
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-cd $(dirname $0)
-
-failed=false
-args="-f docker-compose.test.yml"
-docker-compose $args run sut || failed=true
-echo "
-Result: failed=$failed"
-
-$failed && docker-compose $args logs mc
-docker-compose $args down -v
-
-if $failed; then
-  exit 1
-fi
-
Author	SHA1	Message	Date
Geoff Bourne	a196739ed2	Auto-merging via docker-versions-create	2020-07-11 13:13:04 -05:00
Geoff Bourne	87939c3d14	Auto-merging via docker-versions-create	2020-07-10 17:11:06 -05:00
Geoff Bourne	13b2104e84	Auto-merging via docker-versions-create	2020-07-04 14:57:31 -05:00
Geoff Bourne	c6cf39948a	Auto-merging via docker-versions-create	2020-06-20 15:44:28 -05:00
Geoff Bourne	3439020ed6	Auto-merging via docker-versions-create	2020-06-19 13:26:25 -05:00
Geoff Bourne	503bd86ab6	Auto-merging via docker-versions-create	2020-05-20 08:14:33 -05:00
Geoff Bourne	6bd25c20c3	Aligned with openj9 branch #521	2020-05-06 16:10:47 -05:00
Geoff Bourne	480b7645ba	Auto-merging via docker-versions-create	2020-05-02 09:34:03 -05:00
Geoff Bourne	dd80e5ebd5	Auto-merging via docker-versions-create	2020-04-25 12:10:38 -05:00
Geoff Bourne	8164ac05c1	Auto-merging via docker-versions-create	2020-04-17 21:28:41 -05:00
Geoff Bourne	70c61aed5c	Auto-merging via docker-versions-create	2020-04-11 08:51:41 -05:00
Geoff Bourne	3bde06fcfc	Auto-merging via docker-versions-create	2020-04-10 11:08:47 -05:00
Geoff Bourne	f7eb33b41b	Auto-merging via docker-versions-create	2020-04-03 13:31:35 -05:00
Geoff Bourne	1f7eafef87	Auto-merging via docker-versions-create	2020-04-03 13:28:47 -05:00
Geoff Bourne	0670114602	Auto-merging via docker-versions-create	2020-04-02 17:47:36 -05:00
Geoff Bourne	4feec8000b	Auto-merging via docker-versions-create	2020-03-30 08:31:58 -05:00
Geoff Bourne	e6db79cbbb	Auto-merging via docker-versions-create	2020-03-26 20:54:07 -05:00
Geoff Bourne	9d97a227f6	Auto-merging via docker-versions-create	2020-02-01 08:52:57 -06:00
Geoff Bourne	5d3393d66b	Auto-merging via docker-versions-create	2020-01-17 08:29:08 -06:00
Geoff Bourne	99c1fc81f1	Auto-merging via docker-versions-create	2019-11-16 09:30:57 -06:00
Geoff Bourne	ee97808168	Auto-merging via docker-versions-create	2019-11-16 09:04:21 -06:00
Geoff Bourne	2673d1c921	Merge branch 'master' into openj9-nightly	2019-11-16 09:01:30 -06:00
Geoff Bourne	9b7d5b35e4	Base image on adoptopenjdk/openjdk8-openj9:alpine-nightly	2019-11-02 08:40:48 -05:00