Added logic to skip --noconsole on newer versions

Fixes #452
Added support for TYPE=CURSE_INSTANCE
2026-02-17 15:13:55 +00:00 · 2020-04-13 18:29:44 -05:00 · 2020-04-12 14:31:19 -05:00 · 2020-04-12 09:39:28 -05:00 · 2020-04-11 10:51:30 -05:00 · 2020-04-11 10:41:20 -05:00
36 changed files with 597 additions and 338 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,4 +14,9 @@ workflows:
  version: 2
  build:
    jobs:
-      - minecraft_server
+      - minecraft_server:
+          filters:
+            branches:
+              ignore:
+                - armv7
+                - multiarch
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,5 @@
 data
 examples
 k8s-examples
-.idea
+.idea
+.git
--- a/43
+++ b/43
@@ -15,10 +15,7 @@ RUN apk add --no-cache -U \
  mysql-client \
  tzdata \
  rsync \
-  nano \
-  python python-dev py2-pip
-
-RUN pip install yq
+  nano

 HEALTHCHECK --start-period=1m CMD mc-monitor status --host localhost --port $SERVER_PORT

@@ -29,29 +26,41 @@ RUN addgroup -g 1000 minecraft \

 EXPOSE 25565 25575

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

-ARG EASY_ADD_VER=0.3.0
-ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${EASY_ADD_VER}_linux_${ARCH} /usr/bin/easy-add
+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
 RUN chmod +x /usr/bin/easy-add

-ARG RESTIFY_VER=1.2.1
-RUN easy-add --file restify --from https://github.com/itzg/restify/releases/download/${RESTIFY_VER}/restify_${RESTIFY_VER}_linux_${ARCH}.tar.gz
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+  --var version=1.2.0 --var app=restify --file {{.app}} \
+  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

-ARG RCON_CLI_VER=1.4.7
-RUN easy-add --file rcon-cli --from https://github.com/itzg/rcon-cli/releases/download/${RCON_CLI_VER}/rcon-cli_${RCON_CLI_VER}_linux_${ARCH}.tar.gz
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --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

-ARG MC_MONITOR_VER=0.1.6
-RUN easy-add --file mc-monitor --from https://github.com/itzg/mc-monitor/releases/download/v${MC_MONITOR_VER}/mc-monitor_${MC_MONITOR_VER}_Linux_${ARCH}.tar.gz
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=0.1.7 --var app=mc-monitor --file {{.app}} \
+ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz

-ARG MC_RUN_VER=1.3.3
-RUN easy-add --file mc-server-runner --from https://github.com/itzg/mc-server-runner/releases/download/${MC_RUN_VER}/mc-server-runner_${MC_RUN_VER}_linux_${ARCH}.tar.gz
+RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
+ --var version=1.4.2 --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

-COPY mcadmin.jq /usr/share
 COPY mcstatus /usr/local/bin

-VOLUME ["/data","/mods","/config"]
+VOLUME ["/data"]
 COPY server.properties /tmp/server.properties
+COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data

 ENTRYPOINT [ "/start" ]
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-
 [![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)
@@ -7,10 +6,12 @@

 This docker image provides a Minecraft Server that will automatically download the latest stable
 version at startup. You can also run/upgrade to any specific version or the
-latest snapshot. See the *Versions* section below for more information.
+latest snapshot. See the _Versions_ section below for more information.

 [![Click for more docs](https://i.imgur.com/jS02ebD.png)](https://github.com/itzg/docker-minecraft-server/blob/master/README.md)

+[Full docs available in Github](https://github.com/itzg/docker-minecraft-server/blob/master/README.md)
+
 To simply use the latest stable version, run

    docker run -d -p 25565:25565 --name mc itzg/minecraft-server
@@ -106,9 +107,9 @@ and start the server again with `docker start CONTAINERID` to pick up the new co

 To use a different Minecraft version, pass the `VERSION` environment variable, which can have the value

-* LATEST (the default)
-* SNAPSHOT
-* or a specific version, such as "1.7.9"
+- LATEST (the default)
+- SNAPSHOT
+- or a specific version, such as "1.7.9"

 For example, to use the latest snapshot:

@@ -118,15 +119,34 @@ or a specific version:

    docker run -d -e VERSION=1.7.9 ...

-When using "LATEST" or "SNAPSHOT" an upgrade can be performed by simply restarting the container. 
+When using "LATEST" or "SNAPSHOT" an upgrade can be performed by simply restarting the container.
 During the next startup, if a newer version is available from the respective release channel, then
 the new server jar file is downloaded and used. _NOTE: over time you might see older versions of
 the server jar remain in the `/data` directory. It is safe to remove those._

+## Running Minecraft server on different Java version
+
+To use a different version of Java, please use a docker tag to run your Minecraft server.
+
+| 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 a Java version 13:
+
+    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.
+
 ## Healthcheck

-This image contains [Dinnerbone's mcstatus](https://github.com/Dinnerbone/mcstatus) and uses
-its `ping` command to continually check on the container's. That can be observed
+This image contains [mc-monitor](https://github.com/itzg/mc-monitor) and uses
+its `status` command to continually check on the container's. That can be observed
 from the `STATUS` column of `docker ps`

 ```
@@ -141,15 +161,16 @@ You can also query the container's health in a script friendly way:
 healthy
 ```

-Finally, since `mcstatus` is on the `PATH` you can exec into the container
-and use mcstatus directly and invoke any of its other commands:
+## Deployment Templates and Examples

-```
-> docker exec mc mcstatus localhost status
-version: v1.12 (protocol 335)
-description: "{u'text': u'A Minecraft Server Powered by Docker'}"
-players: 0/20 No players online
-```
+### Helm Charts
+
+- [stable/minecraft](https://hub.helm.sh/charts/stable/minecraft) ([chart source](https://github.com/helm/charts/tree/master/stable/minecraft))
+- [mcsh/server-deployment](https://github.com/mcserverhosting-net/charts)
+
+### Examples
+
+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.

 ## Running a Forge Server

@@ -229,7 +250,7 @@ For those cases there is the option to replace defined variables inside your con
 with environment variables defined at container runtime.

 If you set the enviroment variable `REPLACE_ENV_VARIABLES` to `TRUE` the startup script
-will go thru all files inside your `/data` volume and replace variables that match your 
+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.
@@ -251,17 +272,18 @@ Variables will be replaced in files with the following extensions:
 Here is a full example where we want to replace values inside a `database.yml`.

 ```yml
-...
+
+---
 database:
-    host: ${CFG_DB_HOST}
-    name: ${CFG_DB_NAME}
-    password: ${CFG_DB_PASSWORD}
+  host: ${CFG_DB_HOST}
+  name: ${CFG_DB_NAME}
+  password: ${CFG_DB_PASSWORD}
 ```

 This is how your `docker-compose.yml` file could look like:

 ```yml
-version: '3'
+version: "3"
 # Other docker-compose examples in /examples

 services:
@@ -307,19 +329,19 @@ Enable Bukkit/Spigot server mode by adding a `-e TYPE=BUKKIT -e VERSION=1.8` or
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

 If you are hosting your own copy of Bukkit/Spigot you can override the download URLs with:
-* -e BUKKIT_DOWNLOAD_URL=<url>
-* -e SPIGOT_DOWNLOAD_URL=<url>
+
+- -e BUKKIT_DOWNLOAD_URL=<url>
+- -e SPIGOT_DOWNLOAD_URL=<url>

 You can build spigot from source by adding `-e BUILD_FROM_SOURCE=true`

-__NOTE: to avoid pegging the CPU when running Spigot,__ you will need to
+**NOTE: to avoid pegging the CPU when running Spigot,** you will need to
 pass `--noconsole` at the very end of the command line and not use `-it`. For example,

    docker run -d -v /path/on/host:/data \
        -e TYPE=SPIGOT -e VERSION=1.8 \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server --noconsole

-
 You can install Bukkit plugins in two ways...

 ### Using the /data volume
@@ -360,15 +382,6 @@ This works well if you want to have a common set of plugins in a separate
 location, but still have multiple worlds with different server requirements
 in either persistent volumes or a downloadable archive.

-### Building an image with plugins
-
-You can also create your own Docker images by extending the `itzg/minecraft-server` image.
-The image contains an `ONBUILD` trigger that will copy a `plugins.yml` file from you build directory and download any plugins specified in it.
-
-You can read about the [`ToF-BuildTools` and how to use them here](https://git.faldoria.de/tof/server/build-tools).
-
-You can also find [an example](examples/ToF-build/) with a custom image in the examples dir.
-
 ## Running a PaperSpigot server

 Enable PaperSpigot server mode by adding a `-e TYPE=PAPER -e VERSION=1.9.4` to your command-line.
@@ -377,7 +390,7 @@ Enable PaperSpigot server mode by adding a `-e TYPE=PAPER -e VERSION=1.9.4` to y
        -e TYPE=PAPER -e VERSION=1.9.4 \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

-__NOTE: to avoid pegging the CPU when running PaperSpigot,__ you will need to
+**NOTE: to avoid pegging the CPU when running PaperSpigot,** you will need to
 pass `--noconsole` at the very end of the command line and not use `-it`. For example,

    docker run -d -v /path/on/host:/data \
@@ -385,11 +398,12 @@ pass `--noconsole` at the very end of the command line and not use `-it`. For ex
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server --noconsole

 If you are hosting your own copy of PaperSpigot you can override the download URL with:
-* -e PAPER_DOWNLOAD_URL=<url>
+
+- -e PAPER_DOWNLOAD_URL=<url>

 You can install Bukkit plugins in two ways...

-An example compose file is provided at 
+An example compose file is provided at
 [examples/docker-compose-paper.yml](examples/docker-compose-paper.yml).

 ### Using the /data volume
@@ -438,11 +452,7 @@ but note the following additional steps needed...
 You need to specify a modpack to run, using the `FTB_SERVER_MOD` or `CF_SERVER_MOD` environment
 variable. An FTB/CurseForge server modpack is available together with its respective
 client modpack on https://www.feed-the-beast.com under "Additional Files." Similar you can
-locate the modpacks for CurseForge at https://minecraft.curseforge.com/modpacks .
-
-There are a couple of options for obtaining an FTB/CurseForge modpack. 
-One options is that you can pre-download the **server** modpack and copy the modpack to the `/data`
-directory (see "Attaching data directory to host filesystem”).
+locate the modpacks for CurseForge at https://www.curseforge.com/minecraft/modpacks .

 Now you can add a `-e FTB_SERVER_MOD=name_of_modpack.zip` to your command-line.

@@ -450,39 +460,13 @@ Now you can add a `-e FTB_SERVER_MOD=name_of_modpack.zip` to your command-line.
        -e FTB_SERVER_MOD=FTBPresentsSkyfactory3Server_3.0.6.zip \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

-Instead of pre-downloading a modpack from the FTB/CurseForge site, you
-can you set `FTB_SERVER_MOD` (or `CF_SERVER_MOD`) to the **server** URL of a modpack, such as
+If you don't want to keep the pre-download modpacks separate from your data directory,
+then you can attach another volume at a path of your choosing and reference that.
+The following example uses `/modpacks` as the container path as the pre-download area:

-    docker run ... \
-      -e TYPE=FTB \
-      -e FTB_SERVER_MOD=https://www.feed-the-beast.com/projects/ftb-infinity-lite-1-10/files/2402889
-
-or for a CurseForce modpack:
-
-    docker run ... \
-      -e TYPE=CURSEFORGE \
-      -e CF_SERVER_MOD=https://minecraft.curseforge.com/projects/enigmatica2expert/files/2663153/download
-
-### Using the /data volume
-
-You must use a persistent `/data` mount for this type of server.
-
-To do this, you will need to attach the container's `/data` directory
-(see "Attaching data directory to host filesystem”).
-
-If the modpack is updated and you want to run the new version on your
-server, you stop and remove the container:
-
-    docker stop mc
-    docker rm mc
-
-Do not erase anything from your /data directory (unless you know of
-specific mods that have been removed from the modpack). Download the
-updated FTB server modpack and copy it to `/data`. Start a new container
-with `FTB_SERVER_MOD` specifying the updated modpack file.
-
-    $ docker run -d -v /path/on/host:/data -e TYPE=FTB \
-        -e FTB_SERVER_MOD=FTBPresentsSkyfactory3Server_3.0.7.zip \
+    docker run -d -v /path/on/host:/data -v /path/to/modpacks:/modpacks \
+        -e TYPE=FTB \
+        -e FTB_SERVER_MOD=/modpacks/FTBPresentsSkyfactory3Server_3.0.6.zip \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

 ### Fixing "unable to launch forgemodloader"
@@ -497,8 +481,8 @@ then you apply a workaround by adding this to the run invocation:

 ### Using a client-made curseforge modpack

-If you use something like curseforge, you may end up creating/using modpacks that do not
-contain server mod jars. Instead, the curseforge setup has `manifest.json` files, which
+If you use something like CurseForge, you may end up creating/using modpacks that do not
+contain server mod jars. Instead, the CurseForge setup has `manifest.json` files, which
 will show up under `/data/FeedTheBeast/manifest.json`.

 To use these packs you will need to:
@@ -529,7 +513,7 @@ $ docker run -itd --name derpcraft \
  itzg/minecraft-server
 ```

-Note the `CF_SERVER_MOD` env var should match the url to download the modpack you are targeting.
+Note the `CF_SERVER_MOD` env var should match the server version of the modpack you are targeting.

 ## Running a SpongeVanilla server

@@ -615,16 +599,16 @@ in either persistent volumes or a downloadable archive.
 ## Running with a custom server JAR

 If you would like to run a custom server JAR, set `-e TYPE=CUSTOM` and pass the custom server
-JAR via `CUSTOM_SERVER`. It can either be a URL or a container path to an existing JAR file. 
+JAR via `CUSTOM_SERVER`. It can either be a URL or a container path to an existing JAR file.

 If it is a URL, it will only be downloaded into the `/data` directory if it wasn't already. As
 such, if you need to upgrade or re-download the JAR, then you will need to stop the container,
-remove the file from the container's `/data` directory, and start again. 
+remove the file from the container's `/data` directory, and start again.

 ## Force re-download of the server file

-For VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, CURSEFORGE, SPONGEVANILLA server types, set 
-`$FORCE_REDOWNLOAD` to some value (e.g. 'true) to force a re-download of the server file for 
+For VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, CURSEFORGE, SPONGEVANILLA server types, set
+`$FORCE_REDOWNLOAD` to some value (e.g. 'true) to force a re-download of the server file for
 the particular server type. by adding a `-e FORCE_REDOWNLOAD=true` to your command-line.

 For example, with PaperSpigot, it would look something like this:
@@ -663,8 +647,8 @@ and in the same directory as that file run

    docker-compose up -d

-Now, go play...or adjust the  `environment` section to configure
-this server instance.    
+Now, go play...or adjust the `environment` section to configure
+this server instance.

 ## Server configuration

@@ -707,7 +691,7 @@ values.

 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 ...
+    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.

@@ -715,7 +699,7 @@ If the `WHITELIST` environment variable is not used, any user can join your Mine

 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 ...
+    docker run -d -e OPS=user1,user2 ...

 ### Server icon

@@ -738,19 +722,17 @@ By default the query port will be `25565` (UDP) but can easily be changed with t

    docker run -d -e ENABLE_QUERY=true

-
 ### Max players

 By default max players is 20, you can increase this with the `MAX_PLAYERS` variable.

    docker run -d -e MAX_PLAYERS=50

-
 ### Max world size

 This sets the maximum possible size in blocks, expressed as a radius, that the world border can obtain.

-    docker run -d -e MAX_WORLD_SIZE=10000   
+    docker run -d -e MAX_WORLD_SIZE=10000

 ### Allow Nether

@@ -762,9 +744,9 @@ Allows players to travel to the Nether.

 Allows server to announce when a player gets an achievement.

-    docker run -d -e ANNOUNCE_PLAYER_ACHIEVEMENTS=true   
+    docker run -d -e ANNOUNCE_PLAYER_ACHIEVEMENTS=true

-### Enable  Command Block
+### Enable Command Block

 Enables command blocks

@@ -774,19 +756,19 @@ Enables command blocks

 Force players to join in the default game mode.

-* false - Players will join in the gamemode they left in.
-* true - Players will always join in the default gamemode.
+- false - Players will join in the gamemode they left in.
+- true - Players will always join in the default gamemode.

-    `docker run -d -e FORCE_GAMEMODE=false`
+  `docker run -d -e FORCE_GAMEMODE=false`

 ### Generate Structures

 Defines whether structures (such as villages) will be generated.

-* false - Structures will not be generated in new chunks.
-* true - Structures will be generated in new chunks.
+- false - Structures will not be generated in new chunks.
+- true - Structures will be generated in new chunks.

-    `docker run -d -e GENERATE_STRUCTURES=true`
+  `docker run -d -e GENERATE_STRUCTURES=true`

 ### Hardcore

@@ -831,7 +813,7 @@ Determines if monsters will be spawned.
 Determines if villagers will be spawned.

    docker run -d -e SPAWN_NPCS=true
-    
+
 ### Set spawn protection

 Sets the area that non-ops can not edit (0 to disable)
@@ -839,6 +821,7 @@ Sets the area that non-ops can not edit (0 to disable)
    docker run -d -e SPAWN_PROTECTION=0

 ### View Distance
+
 Sets the amount of world data the server sends the client, measured in chunks in each direction of the player (radius, not diameter).
 It determines the server-side viewing distance.

@@ -857,10 +840,10 @@ change the mode using `MODE` where you can either provide the [standard
 numerical values](http://minecraft.gamepedia.com/Game_mode#Game_modes) or the
 shortcut values:

-* creative
-* survival
-* adventure
-* spectator (only for Minecraft 1.8 or later)
+- creative
+- survival
+- adventure
+- spectator (only for Minecraft 1.8 or later)

 For example:

@@ -893,12 +876,12 @@ environment variable set to `false`, such as
 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, such as

-* DEFAULT
-* FLAT
-* LARGEBIOMES
-* AMPLIFIED
-* CUSTOMIZED
-* BUFFET
+- DEFAULT
+- FLAT
+- LARGEBIOMES
+- AMPLIFIED
+- CUSTOMIZED
+- BUFFET

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

@@ -931,10 +914,10 @@ where the default is "world":
 ### Downloadable world

 Instead of mounting the `/data` volume, you can instead specify the URL of
-a ZIP file containing an archived world.  This will be downloaded, and
+a ZIP file containing an archived world. This will be downloaded, and
 unpacked in the `/data` directory; if it does not contain a subdirectory
 called `world/` then it will be searched for a file `level.dat` and the
-containing subdirectory renamed to `world`.  This means that most of the
+containing subdirectory renamed to `world`. This means that most of the
 archived Minecraft worlds downloadable from the Internet will already be in
 the correct format.

@@ -946,7 +929,7 @@ directory, if required.
 **NOTE:** Unless you also mount `/data` as an external volume, this world
 will be deleted when the container is deleted.

-**NOTE:** This URL must be accessible from inside the container.  Therefore,
+**NOTE:** This URL must be accessible from inside the container. Therefore,
 you should use an IP address or a globally resolveable FQDN, or else the
 name of a linked container.

@@ -960,7 +943,7 @@ from `/worlds/basic`. Also notice in the example that you can use a
 read-only volume attachment to ensure the clone source remains pristine.

 ```
-docker run ... -v $HOME/worlds:/worlds:ro -e WORLD=/worlds/basic 
+docker run ... -v $HOME/worlds:/worlds:ro -e WORLD=/worlds/basic
 ```

 ### Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers
@@ -978,7 +961,7 @@ particular `TYPE` of server you are running.
 You may also download individual mods using the `MODS` environment variable and supplying the URL
 to the jar files. Multiple mods/plugins should be comma separated.

-    docker run -d -e MODS=https://www.example.com/mods/mod1.jar,https://www.example.com/mods/mod2.jar ... 
+    docker run -d -e MODS=https://www.example.com/mods/mod1.jar,https://www.example.com/mods/mod2.jar ...

 ### Remove old mods/plugins

@@ -990,7 +973,7 @@ To use this option pass the environment variable `REMOVE_OLD_MODS="TRUE"`, such
    docker run -d -e REMOVE_OLD_MODS="TRUE" -e MODPACK=http://www.example.com/mods/modpack.zip ...

 **WARNING:** All content of the `mods` or `plugins` directory will be deleted
-before unpacking new content from the MODPACK or MODS. 
+before unpacking new content from the MODPACK or MODS.

 ### Online mode

@@ -1022,10 +1005,10 @@ is passed to `docker run`.
 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`, "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
+- `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:
@@ -1039,7 +1022,25 @@ environment variable. Options like `-X` that need to proceed general JVM options
 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`. 
+`JVM_DD_OPTS=fml.queryResult:confirm`, and will be converted to `-Dfml.queryResult=confirm`.
+
+### 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:
+
+    -e ENABLE_JMX=true -p 7091:7091
+
+### Enable Aikar's Flags
+
+[Aikar has does some research](https://mcflags.emc.gs/) into finding the optimal JVM flags for GC tuning, which becomes more important as more users are connected concurrently. The set of flags documented there can be added using
+
+    -e USE_AIKAR_FLAGS=true
+
+When `MEMORY` is greater than or equal to 12G, then the Aikar flags will be adjusted according to the article.
+
+Large page support can also be enabled by adding
+
+    -e USE_LARGE_PAGES=true

 ### HTTP Proxy

@@ -1058,3 +1059,11 @@ pass that at the end of `docker run` after the image name or set `-e CONSOLE=FAL

 Some older servers get confused and think that the GUI interface is enabled. You can explicitly
 disable that by passing `-e GUI=FALSE`.
+
+## Running on RaspberryPi
+
+To run this image on a RaspberryPi 3 B+, 4, or newer, use the image tag
+
+    itzg/minecraft-server:armv7
+
+> NOTE: you may need to lower the memory allocation, such as `-e MEMORY=750m`
--- 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=('openj9' 'openj9-nightly' 'adopt11')
+branches_list=('openj9' 'openj9-nightly' 'adopt11' 'adopt13' 'multiarch' 'armv7')

 function TrapExit {
  echo "Checking out back in master"
@@ -47,6 +47,9 @@ for branch in "${branches_list[@]}"; do
      exit 1; }
    proceed='False'
    while [[ "$proceed" == "False" ]]; do
+      # Ensure local branch is aligned with remote since docker-versions-create may have been run elsewhere
+      git pull
+
      if git merge -m 'Auto-merging via docker-versions-create' master; then
        proceed="True"
        echo "Branch $branch updated to current master successfully"
--- a/examples/README.md
+++ b/examples/README.md
@@ -0,0 +1,3 @@
+# Deployment Examples
+
+This directory contains various deployment examples of the [itzg/minecraft-server](https://hub.docker.com/r/itzg/minecraft-server/) Docker image.
--- a/examples/ToF-build/Dockerfile
+++ b/examples/ToF-build/Dockerfile
@@ -1,3 +0,0 @@
-FROM itzg/minecraft-server
-
-ENV TYPE=SPIGOT
--- a/examples/ToF-build/plugins.yml
+++ b/examples/ToF-build/plugins.yml
@@ -1,13 +0,0 @@
-plugins:
-  worldedit:
-    file: WorldEdit.jar
-    url: https://dev.bukkit.org/projects/worldedit/files/latest
-  FastAsyncWorldEdit:
-    file: FastAsyncWorldEdit.jar
-    url: https://empcraft.com/fawe/latest.php?bukkit
-  worldguard:
-    file: WorldGuard.jar
-    url: https://dev.bukkit.org/projects/worldguard/files/latest
-  citizens:
-    file: Citizens.jar
-    url: https://dev.bukkit.org/projects/citizens/files/latest
--- a/examples/docker-compose-curseinstance.yml
+++ b/examples/docker-compose-curseinstance.yml
@@ -0,0 +1,20 @@
+version: "3.7"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    ports:
+      - 25565:25565
+    volumes:
+      # Attach .../Curse/Minecraft/Instances for use at /instances
+      - ./Instances:/instances:ro
+      # Attach /data as usual
+      - ./ServerData:/data
+    environment:
+      EULA: "TRUE"
+      # Modpacks generally need more memory, so let's give at 2 GB
+      MEMORY: 2G
+      # Use new CURSE_INSTANCE type
+      TYPE: CURSE_INSTANCE
+      # Reference directory of or full path to minecraftinstance.json
+      CURSE_INSTANCE_JSON: /instances/FTB Presents SkyFactory 3
--- a/examples/k8s/using-statefulset.yml
+++ b/examples/k8s/using-statefulset.yml
--- a/examples/k8s/vanilla-deployment.yml
+++ b/examples/k8s/vanilla-deployment.yml
--- a/examples/paper-build-plugins/Dockerfile
+++ b/examples/paper-build-plugins/Dockerfile
@@ -0,0 +1,5 @@
+FROM itzg/minecraft-server
+
+ENV TYPE=PAPER
+
+COPY plugins/*.jar /plugins/
--- a/examples/paper-build-plugins/docker-compose.yml
+++ b/examples/paper-build-plugins/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3.7'
+
+services:
+  mc:
+    build: .
+    environment:
+      EULA: "TRUE"
+    ports:
+    - 25565:25565
+    stdin_open: true
+    tty: true
--- a/examples/paper-build-plugins/plugins/.gitignore
+++ b/examples/paper-build-plugins/plugins/.gitignore
@@ -0,0 +1 @@
+*.jar
--- a/examples/paper-build-plugins/plugins/README.md
+++ b/examples/paper-build-plugins/plugins/README.md
@@ -0,0 +1 @@
+Download Bukkit/Spigot plugin jars, such as [WorldEdit](https://dev.bukkit.org/projects/worldedit/files) and place them here. At image build time the `COPY` step will place those jars in `/plugins`. At container startup, the contents of `/plugins` are sync'ed into `/data/plugins` for use with Bukkit/Spigot/Paper server types.
--- a/log4j2.xml
+++ b/log4j2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" packages="com.mojang.util">
+    <Appenders>
+        <Console name="SysOut" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+        </Console>
+        <Queue name="ServerGuiConsole">
+            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
+        </Queue>
+        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <OnStartupTriggeringPolicy />
+            </Policies>
+            <DefaultRolloverStrategy>
+                <Delete basePath="logs">
+                    <IfFileName glob="*.log.gz" />
+                    <IfLastModified age="7d" />
+                </Delete>
+            </DefaultRolloverStrategy>
+        </RollingRandomAccessFile>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <filters>
+                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
+            </filters>
+            <AppenderRef ref="SysOut"/>
+            <AppenderRef ref="File"/>
+            <AppenderRef ref="ServerGuiConsole"/>
+        </Root>
+    </Loggers>
+</Configuration>
--- a/mcadmin.jq
+++ b/mcadmin.jq
@@ -1,7 +0,0 @@
-.[] |
- select(.elements | length > 1) |
-  select(.elements[].elements[] | select(.class == "version" and .text == $version)) |
-   .elements[].elements[] |
-    select(.class|contains("server-jar")) |
-     .elements[] | select(.name="a") |
-      .href
--- a/2
+++ b/2
@@ -1,5 +1,7 @@
 #!/bin/bash

+echo "WARNING: mcstatus is deprecated; calling mc-monitor instead"
+
 ##### mcstatus shim for mc-monitor
 # handles translating calls to
 #   mcstatus (host:port) (command)
--- a/8
+++ b/8
@@ -1,5 +1,7 @@
 #!/bin/bash

+. /start-utils
+
 umask 0002
 chmod g+w /data

@@ -10,7 +12,7 @@ if [ $(id -u) = 0 ]; then
  if [[ -v UID ]]; then
    if [[ $UID != 0 ]]; then
      if [[ $UID != $(id -u minecraft) ]]; then
-        echo "Changing uid of minecraft to $UID"
+        log "Changing uid of minecraft to $UID"
        usermod -u $UID minecraft
      fi
    else
@@ -21,7 +23,7 @@ if [ $(id -u) = 0 ]; then
  if [[ -v GID ]]; then
    if [[ $GID != 0 ]]; then
      if [[ $GID != $(id -g minecraft) ]]; then
-        echo "Changing gid of minecraft to $GID"
+        log "Changing gid of minecraft to $GID"
        groupmod -o -g $GID minecraft
      fi
    else
@@ -30,7 +32,7 @@ if [ $(id -u) = 0 ]; then
  fi

  if [[ $(stat -c "%u" /data) != $UID ]]; then
-    echo "Changing ownership of /data to $UID ..."
+    log "Changing ownership of /data to $UID ..."
    chown -R ${runAsUser}:${runAsGroup} /data
  fi

--- a/65
+++ b/65
@@ -1,5 +1,7 @@
 #!/bin/bash

+. /start-utils
+
 shopt -s nullglob

 #umask 002
@@ -8,28 +10,28 @@ export HOME=/data
 if [ ! -e /data/eula.txt ]; then
  EULA="${EULA,,}"
  if [ "$EULA" != "true" ]; then
-    echo ""
-    echo "Please accept the Minecraft EULA at"
-    echo "  https://account.mojang.com/documents/minecraft_eula"
-    echo "by adding the following immediately after 'docker run':"
-    echo "  -e EULA=TRUE"
-    echo ""
+    log ""
+    log "Please accept the Minecraft EULA at"
+    log "  https://account.mojang.com/documents/minecraft_eula"
+    log "by adding the following immediately after 'docker run':"
+    log "  -e EULA=TRUE"
+    log ""
    exit 1
  fi

  echo "# Generated via Docker on $(date)" > eula.txt
-  echo "eula=$EULA" >> eula.txt
-  if [ $? != 0 ]; then
-    echo "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
+
+  if ! echo "eula=$EULA" >> 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


-echo "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
+log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"

 if ! touch /data/.verify_access; then
-  echo "ERROR: /data doesn't seem to be writable. Please make sure attached directory is writable by uid=$(id -u)"
+  log "ERROR: /data doesn't seem to be writable. Please make sure attached directory is writable by uid=$(id -u)"
  exit 2
 fi

@@ -38,70 +40,75 @@ rm /data/.verify_access || true
 if [[ $PROXY ]]; then
    export http_proxy="$PROXY"
    export https_proxy="$PROXY"
-    echo "INFO: Giving proxy time to startup..."
+    log "INFO: Giving proxy time to startup..."
    sleep 5
 fi

 export SERVER_PROPERTIES=/data/server.properties
 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json

-echo "Checking version information."
 case "X$VERSION" in
  X|XLATEST|Xlatest)
-    export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.release'`
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
  ;;
  XSNAPSHOT|Xsnapshot)
-    export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot'`
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot')
  ;;
  X[1-9]*)
-    export VANILLA_VERSION=$VERSION
+    VANILLA_VERSION=$VERSION
  ;;
  *)
-    export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.release'`
+    VANILLA_VERSION=$(curl -fsSL $VERSIONS_JSON | jq -r '.latest.release')
  ;;
 esac
+export VANILLA_VERSION
+log "Resolved version given ${VERSION} into ${VANILLA_VERSION}"

-cd /data
+cd /data || exit 1

 export ORIGINAL_TYPE=${TYPE^^}

-echo "Checking type information."
+log "Resolving type given ${TYPE}"
 case "${TYPE^^}" in
  *BUKKIT|SPIGOT)
-    exec /start-deployBukkitSpigot $@
+    exec /start-deployBukkitSpigot "$@"
  ;;

  PAPER)
-    exec /start-deployPaper $@
+    exec /start-deployPaper "$@"
  ;;

  FORGE)
-    exec /start-deployForge $@
+    exec /start-deployForge "$@"
  ;;

  FABRIC)
-    exec /start-deployFabric $@
+    exec /start-deployFabric "$@"
  ;;

  FTB|CURSEFORGE)
-    exec /start-deployFTB $@
+    exec /start-deployFTB "$@"
  ;;

  VANILLA)
-    exec /start-deployVanilla $@
+    exec /start-deployVanilla "$@"
  ;;

  SPONGEVANILLA)
-    exec /start-deploySpongeVanilla $@
+    exec /start-deploySpongeVanilla "$@"
  ;;

  CUSTOM)
-    exec /start-deployCustom $@
+    exec /start-deployCustom "$@"
+  ;;
+
+  CURSE_INSTANCE)
+    exec /start-validateCurseInstance "$@"
  ;;

  *)
-      echo "Invalid type: '$TYPE'"
-      echo "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
+      log "Invalid type: '$TYPE'"
+      log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
      exit 1
  ;;

--- a/28
+++ b/28
@@ -1,24 +1,27 @@
 #!/bin/bash

+. /start-utils
+
 set -e

 function buildSpigotFromSource {
-  echo "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
+  log "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
  rm -rf /data/temp
  mkdir /data/temp
  cd /data/temp

  jvmOpts="-Xms${INIT_MEMORY:-$MEMORY} -Xmx${MAX_MEMORY:-$MEMORY}"

+  logn ''
  curl -sSL -o /data/temp/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && \
-    java $jvmOpts -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; echo "done"
+    java $jvmOpts -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; log "done"
  if ! mv spigot-*.jar /data/spigot_server.jar; then
-    echo "ERR failed to build Spigot"
+    log "ERR failed to build Spigot"
    cat /data/spigot_build.log
    exit 1
  fi
-  mv craftbukkit-*.jar /data/craftbukkit_server.jar
-  echo "Cleaning up"
+  mv craftbukkit-*.jar /data/${SERVER}
+  log "Cleaning up"
  rm -rf /data/temp
  cd /data
 }
@@ -38,18 +41,11 @@ function downloadSpigot {
      ;;
  esac

-  local downloadVersion
-  if [[ ${VERSION} == LATEST ]]; then
-    downloadVersion=${VANILLA_VERSION}
-  else
-    downloadVersion=${VERSION}
-  fi
-
  if [[ -z $downloadUrl ]]; then
-    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${downloadVersion}.jar"
+    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${VANILLA_VERSION}.jar"
  fi

-  echo "Downloading $match from $downloadUrl ..."
+  log "Downloading $match from $downloadUrl ..."
  curl -fsSL -o $SERVER "$downloadUrl"
  if [[ $? != 0 || $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
    cat <<EOF
@@ -66,10 +62,10 @@ EOF

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

--- a/10
+++ b/10
@@ -7,21 +7,21 @@ if isURL ${CUSTOM_SERVER}; then
  export SERVER=/data/${filename}

  if [[ -f ${SERVER} ]] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    echo "Using previously downloaded jar at ${SERVER}"
+    log "Using previously downloaded jar at ${SERVER}"
  else
-   echo "Downloading custom server jar from ${CUSTOM_SERVER} ..."
+   log "Downloading custom server jar from ${CUSTOM_SERVER} ..."
   if ! curl -sSL -o ${SERVER} ${CUSTOM_SERVER}; then
-      echo "Failed to download from ${CUSTOM_SERVER}"
+      log "Failed to download from ${CUSTOM_SERVER}"
      exit 2
    fi
  fi

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

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

--- a/39
+++ b/39
@@ -8,11 +8,11 @@ export TYPE=FEED-THE-BEAST

 FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}

-echo "Looking for Feed-The-Beast / CurseForge server modpack."
+log "Looking for Feed-The-Beast / CurseForge server modpack."
 if [[ -z $FTB_SERVER_MOD ]]; then
-    echo "Environment variable FTB_SERVER_MOD not set."
-    echo "Set FTB_SERVER_MOD to the file name of the FTB server modpack."
-    echo "(And place the modpack in the /data directory.)"
+    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

@@ -21,7 +21,7 @@ entryScriptExpr="-name ServerStart.sh -o -name ServerStartLinux.sh -o -name Laun
 if [[ -d ${FTB_BASE_DIR} ]]; then
  startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l)
  if [[ $startScriptCount > 1 ]]; then
-    echo "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
+    log "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
    exit 2
  fi
 else
@@ -45,7 +45,7 @@ if [[ $startScriptCount = 0 ]]; then
      file=$(basename $(dirname $srv_modpack))
      downloaded=/data/${file}.zip
      if [ ! -e $downloaded ]; then
-        echo "Downloading FTB modpack...
+        log "Downloading FTB modpack...
  $srv_modpack -> $downloaded"
        curl -sSL -o $downloaded $srv_modpack
      fi
@@ -60,26 +60,28 @@ if [[ $startScriptCount = 0 ]]; then
      srv_modpack=/data/${srv_modpack}
  fi
  if [[ ! -f ${srv_modpack} ]]; then
-      echo "FTB server modpack ${srv_modpack} not found."
+      log "FTB server modpack ${srv_modpack} not found."
      exit 2
  fi
  if [[ ! ${srv_modpack: -4} == ".zip" ]]; then
-      echo "FTB server modpack ${srv_modpack} is not a zip archive."
-      echo "Please set FTB_SERVER_MOD to a file with a .zip extension."
+      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
  fi

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

 if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then

-    forgeJar=$(find ${FTB_BASE_DIR} -name 'forge*.jar' -a -not -name 'forge*installer')
+    # Allow up to 2 levels since some modpacks have a top-level directory named
+    # for the modpack
+    forgeJar=$(find ${FTB_BASE_DIR} -maxdepth 2 -name 'forge*.jar' -a -not -name 'forge*installer')
    if [[ "$forgeJar" ]]; then
      export FTB_BASE_DIR=$(dirname "${forgeJar}")
-      echo "No entry script found, so building one for ${forgeJar}"
+      log "No entry script found, so building one for ${forgeJar}"
      cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
 #!/bin/sh
 . ./settings-local.sh
@@ -87,18 +89,18 @@ java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar $(basename "${forgeJar}") nogui
 EOF
      chmod +x "${FTB_BASE_DIR}/ServerStart.sh"
    else
-      echo "Please make sure you are using the server version of the FTB modpack!"
+      log "Please make sure you are using the server version of the FTB modpack!"
      exit 2
    fi
 fi

 scriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l)
 if [[ $scriptCount = 0 ]]; then
-    echo "Please make sure you are using the server version of the FTB modpack!"
+    log "Please make sure you are using the server version of the FTB modpack!"
    exit 2
 elif [[ $scriptCount > 1 ]]; then
-    echo "Ambigous startup scripts in FTB modpack!"
-    echo "found:"
+    log "Ambigous startup scripts in FTB modpack!"
+    log "found:"
    find ${FTB_BASE_DIR} $entryScriptExpr
    exit 2
 fi
@@ -107,12 +109,13 @@ export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)

 export FTB_DIR=$(dirname "${FTB_SERVER_START}")
 chmod a+x "${FTB_SERVER_START}"
-sed -i 's/-jar/-Dfml.queryResult=confirm -jar/' "${FTB_SERVER_START}"
+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"

 if isTrue ${FTB_LEGACYJAVAFIXER} && [ ! -e "${legacyJavaFixerPath}" ]; then
-  echo "Installing legacy java fixer to ${legacyJavaFixerPath}"
+  log "Installing legacy java fixer to ${legacyJavaFixerPath}"
  curl -sSL -o "${legacyJavaFixerPath}" ${legacyJavaFixerUrl}
 fi

--- a/21
+++ b/21
@@ -9,11 +9,10 @@ FABRIC_INSTALLER=${FABRIC_INSTALLER:-}
 FABRIC_INSTALLER_URL=${FABRIC_INSTALLER_URL:-}
 FABRICVERSION=${FABRICVERSION:-LATEST}
 if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
-  echo "Checking Fabric version information."
+  log "Checking Fabric version information."
  case $FABRICVERSION in
    LATEST)
-      curl -fsSL https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml | xq -c . > /tmp/fabric.json
-      FABRIC_VERSION=$(< /tmp/fabric.json jq -r ".metadata.versioning.release")
+      FABRIC_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml)
      ;;

    *)
@@ -26,7 +25,7 @@ if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
 elif [[ -z $FABRIC_INSTALLER ]]; then
  FABRIC_INSTALLER="/tmp/fabric-installer.jar"
 elif [[ ! -e $FABRIC_INSTALLER ]]; then
-  echo "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
+  log "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
  exit 2
 fi

@@ -36,14 +35,14 @@ debug Checking for installMarker ${installMarker}
 if [[ ! -e $installMarker ]]; then
  if [[ ! -e $FABRIC_INSTALLER ]]; then
    if [[ -z $FABRIC_INSTALLER_URL ]]; then
-      echo "Downloading $FABRIC_VERSION"
+      log "Downloading $FABRIC_VERSION"
      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/$FABRIC_VERSION/fabric-installer-$FABRIC_VERSION.jar"
-      echo "...trying $downloadUrl"
+      log "...trying $downloadUrl"
      curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
    else
-      echo "Downloading $FABRIC_INSTALLER_URL ..."
+      log "Downloading $FABRIC_INSTALLER_URL ..."
      if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
-        echo "Failed to download from given location $FABRIC_INSTALLER_URL"
+        log "Failed to download from given location $FABRIC_INSTALLER_URL"
        exit 2
      fi
    fi
@@ -52,7 +51,7 @@ if [[ ! -e $installMarker ]]; then
  if isDebugging; then
    debug "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER with mcversion ${VANILLA_VERSION}"
  else
-    echo "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
+    log "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
  fi
  tries=3
  set +e
@@ -64,11 +63,11 @@ if [[ ! -e $installMarker ]]; then
  done
  set -e
  if (($tries < 0)); then
-    echo "Fabric failed to install after several tries." >&2
+    log "Fabric failed to install after several tries." >&2
    exit 10
  fi
  export SERVER=fabric-server-launch.jar
-  echo "Using server $SERVER"
+  log "Using server $SERVER"
  echo $SERVER > $installMarker

 else
--- a/30
+++ b/30
@@ -1,5 +1,7 @@
 #!/bin/bash

+. /start-utils
+
 export TYPE=FORGE

 if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
@@ -14,7 +16,7 @@ if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then

  #################################################################################

-  echo "Checking Forge version information."
+  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
@@ -22,8 +24,8 @@ if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
      if [ $FORGE_VERSION = null ]; then
        FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
        if [ $FORGE_VERSION = null ]; then
-          echo "ERROR: Version $VANILLA_VERSION is not supported by Forge"
-          echo "       Refer to http://files.minecraftforge.net/ for supported versions"
+          log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
+          log "       Refer to http://files.minecraftforge.net/ for supported versions"
          exit 2
        fi
      fi
@@ -41,7 +43,7 @@ if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
 elif [[ -z $FORGE_INSTALLER ]]; then
  FORGE_INSTALLER="/tmp/forge-installer.jar"
 elif [[ ! -e $FORGE_INSTALLER ]]; then
-  echo "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
+  log "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
  exit 2
 fi

@@ -51,7 +53,7 @@ if [ ! -e $installMarker ]; then
  if [ ! -e $FORGE_INSTALLER ]; then

    if [[ -z $FORGE_INSTALLER_URL ]]; then
-      echo "Downloading $normForgeVersion"
+      log "Downloading $normForgeVersion"

      forgeFileNames="
      $normForgeVersion/forge-$normForgeVersion-installer.jar
@@ -60,25 +62,25 @@ if [ ! -e $installMarker ]; then
    "
      for fn in $forgeFileNames; do
        if [ $fn == END ]; then
-          echo "Unable to compute URL for $normForgeVersion"
+          log "Unable to compute URL for $normForgeVersion"
          exit 2
        fi
        downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
-        echo "...trying $downloadUrl"
+        log "...trying $downloadUrl"
        if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
          break
        fi
      done
    else
-      echo "Downloading $FORGE_INSTALLER_URL ..."
+      log "Downloading $FORGE_INSTALLER_URL ..."
      if ! curl -o $FORGE_INSTALLER -fsSL $FORGE_INSTALLER_URL; then
-        echo "Failed to download from given location $FORGE_INSTALLER_URL"
+        log "Failed to download from given location $FORGE_INSTALLER_URL"
        exit 2
      fi
    fi
  fi

-  echo "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
+  log "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
  mkdir -p mods
  tries=3
  while ((--tries >= 0)); do
@@ -88,22 +90,22 @@ if [ ! -e $installMarker ]; then
    fi
  done
  if (($tries < 0)); then
-    echo "Forge failed to install after several tries." >&2
+    log "Forge failed to install after several tries." >&2
    exit 10
  fi
  # NOTE $shortForgeVersion will be empty if installer location was given to us
-  echo "Finding installed server jar..."
+  log "Finding installed server jar..."
  unset -v latest
  for file in *forge*.jar; do
    [[ $file =~ installer ]] || [[ $file -nt $latest ]] && latest=$file
  done
  if [[ -z $latest ]]; then
-    echo "Unable to derive server jar for Forge"
+    log "Unable to derive server jar for Forge"
    exit 2
  fi

  export SERVER=$latest
-  echo "Using server $SERVER"
+  log "Using server $SERVER"
  echo $SERVER > $installMarker

 else
--- a/6
+++ b/6
@@ -1,12 +1,14 @@
 #!/bin/bash

+. /start-utils
+
 export SERVER=paper_server-${VANILLA_VERSION}.jar
 if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
    downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/latest/download}
-    echo "Downloading Paper $VANILLA_VERSION from $downloadUrl ..."
+    log "Downloading Paper $VANILLA_VERSION from $downloadUrl ..."
    curl -fsSL -o "$SERVER" "$downloadUrl"
    if [ ! -f "$SERVER" ]; then
-      echo "ERROR: failed to download from $downloadUrl (status=$?)"
+      log "ERROR: failed to download from $downloadUrl (status=$?)"
      exit 3
    fi
 fi
--- a/8
+++ b/8
@@ -1,9 +1,11 @@
 #!/bin/bash

+. /start-utils
+
 export TYPE=spongevanilla

 # Parse branch
-echo "Choosing branch for Sponge"
+log "Choosing branch for Sponge"
 case "$SPONGEBRANCH" in

  EXPERIMENTAL|experimental|BLEEDING|bleeding)
@@ -18,7 +20,7 @@ esac

 # If not SPONGEVERSION selected, detect last version on selected branch
 if [ -z $SPONGEVERSION ]; then
-  echo "Choosing Version for Sponge"
+  log "Choosing Version for Sponge"
  if [ "$SPONGEBRANCH" == "stable" ]; then
    export SPONGEVERSION=`curl -fsSL https://dl-api.spongepowered.org/v1/org.spongepowered/$TYPE | jq -r '.buildTypes.stable.latest.version'`
  else
@@ -29,7 +31,7 @@ fi
 export SERVER="spongevanilla-$SPONGEVERSION.jar"

 if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-  echo "Downloading $SERVER ..."
+  log "Downloading $SERVER ..."
  curl -sSL -o $SERVER https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER
 fi

--- a/10
+++ b/10
@@ -6,16 +6,16 @@ set -o pipefail
 export SERVER="minecraft_server.${VANILLA_VERSION// /_}.jar"

 if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-  echo "Downloading $SERVER ..."
+  log "Downloading $SERVER ..."
  debug "Finding version manifest for $VANILLA_VERSION"
  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
-    echo "ERROR failed to obtain version manifest URL ($result)"
+    log "ERROR failed to obtain version manifest URL ($result)"
    exit 1
  fi
  if [ $versionManifestUrl = "null" ]; then
-    echo "ERROR couldn't find a matching manifest entry for $VANILLA_VERSION"
+    log "ERROR couldn't find a matching manifest entry for $VANILLA_VERSION"
    exit 1
  fi
  debug "Found version manifest at $versionManifestUrl"
@@ -23,7 +23,7 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
  serverDownloadUrl=$(curl -fsSL ${versionManifestUrl} | jq --raw-output '.downloads.server.url')
  result=$?
  if [ $result != 0 ]; then
-    echo "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
+    log "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
    exit 1
  fi

@@ -34,7 +34,7 @@ if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
  curl $verbose -fsSL -o $SERVER $serverDownloadUrl
  result=$?
  if [ $result != 0 ]; then
-    echo "ERROR failed to download server from $serverDownloadUrl ($result)"
+    log "ERROR failed to download server from $serverDownloadUrl ($result)"
    exit 1
  fi
 fi
--- a/25
+++ b/25
@@ -1,5 +1,7 @@
 #!/bin/bash

+. /start-utils
+
 if [ $TYPE = "FEED-THE-BEAST" ]; then
  worldDest=$FTB_BASE_DIR/$LEVEL
 else
@@ -10,38 +12,39 @@ fi
 if [[ "$WORLD" ]] && [ ! -d "$worldDest" ]; then
 case "X$WORLD" in
  X[Hh][Tt][Tt][Pp]*)
-    echo "Downloading world from $WORLD"
+    log "Downloading world from $WORLD"
    curl -sSL -o - "$WORLD" > /data/world.zip
-    echo "Unzipping world"
+    log "Unzipping world"
    unzip -o -q /data/world.zip
    rm -f /data/world.zip
    if [ ! -d $worldDest ]; then
-      echo World directory not found
+      log World directory not found
      for i in /data/*/level.dat; do
        if [ -f "$i" ]; then
          d=`dirname "$i"`
-          echo Renaming world directory from $d
+          log Renaming world directory from $d
          mv -f "$d" $worldDest
        fi
      done
    fi
    if [ "$TYPE" = "SPIGOT" ]; then
      # Reorganise if a Spigot server
-      echo "Moving End and Nether maps to Spigot location"
+      log "Moving End and Nether maps to Spigot location"
      [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "/data/${LEVEL}_the_end"
      [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "/data/${LEVEL}_nether"
    fi
    ;;
  *)
-    if [[ -d $WORLD ]]; then
-      if [[ ! -d $worldDest ]]; then
-        echo "Cloning world directory from $WORLD ..."
-        cp -r $WORLD $worldDest
+    if [[ -d "$WORLD" ]]; then
+      if [[ ! -d "$worldDest" ]]; then
+        log "Cloning world directory from $WORLD ..."
+        cp -r "$WORLD" "$worldDest"
      else
-        echo "Skipping clone from $WORLD since $worldDest exists"
+        log "Skipping clone from $WORLD since $worldDest exists"
      fi
    else
-      echo "Invalid URL given for world: Must be HTTP or HTTPS and a ZIP file"
+      log "World cloning source '$WORLD' doesn't seem to exist"
+      exit 1
    fi
    ;;
 esac
--- a/53
+++ b/53
@@ -21,28 +21,28 @@ if [[ "$MODPACK" ]]; then
 EFFECTIVE_MODPACK_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MODPACK)
 case "X$EFFECTIVE_MODPACK_URL" in
  X[Hh][Tt][Tt][Pp]*.zip)
-    echo "Downloading mod/plugin pack via HTTP"
-    echo "  from $EFFECTIVE_MODPACK_URL ..."
+    log "Downloading mod/plugin pack via HTTP"
+    log "  from $EFFECTIVE_MODPACK_URL ..."
    if ! curl -sSL -o /tmp/modpack.zip "$EFFECTIVE_MODPACK_URL"; then
-      echo "ERROR: failed to download from $EFFECTIVE_MODPACK_URL"
+      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
-        echo "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
+        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
-        echo "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
+        log "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
      fi
    fi
    rm -f /tmp/modpack.zip
    ;;
  *)
-    echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
+    log "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
    ;;
 esac
 fi
@@ -54,10 +54,10 @@ 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)
-      echo "Downloading mod/plugin via HTTP"
-      echo "  from $EFFECTIVE_MOD_URL ..."
+      log "Downloading mod/plugin via HTTP"
+      log "  from $EFFECTIVE_MOD_URL ..."
      if ! curl -sSL -o /tmp/${EFFECTIVE_MOD_URL##*/} $EFFECTIVE_MOD_URL; then
-        echo "ERROR: failed to download from $EFFECTIVE_MOD_URL to /tmp/${EFFECTIVE_MOD_URL##*/}"
+        log "ERROR: failed to download from $EFFECTIVE_MOD_URL to /tmp/${EFFECTIVE_MOD_URL##*/}"
        exit 2
      fi

@@ -71,7 +71,7 @@ do
      rm -f /tmp/${EFFECTIVE_MOD_URL##*/}
      ;;
    *)
-      echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
+      log "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
      ;;
  esac
 done
@@ -85,7 +85,7 @@ if [[ "$MANIFEST" ]]; then
        EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MANIFEST)
        curl -Ls -o $EFFECTIVE_MANIFEST_FILE "$EFFECTIVE_MANIFEST_URL"
    else
-        echo "MANIFEST='$MANIFEST' is not a valid manifest url or location"
+        log "MANIFEST='$MANIFEST' is not a valid manifest url or location"
        exit 2
    fi

@@ -95,27 +95,27 @@ case "X$EFFECTIVE_MANIFEST_FILE" in
      MOD_DIR=${FTB_BASE_DIR:-/data}/mods
      if [ ! -d "$MOD_DIR" ]
      then
-        echo "Creating mods dir $MOD_DIR"
+        log "Creating mods dir $MOD_DIR"
        mkdir -p "$MOD_DIR"
      fi
-      echo "Starting manifest download..."
+      log "Starting manifest download..."
      cat "${EFFECTIVE_MANIFEST_FILE}" | jq -r '.files[] | (.projectID|tostring) + " " + (.fileID|tostring)'| while read -r p f
      do
        if [ ! -f $MOD_DIR/${p}_${f}.jar ]
        then
          redirect_url="$(curl -Ls -o /dev/null -w %{url_effective} ${CURSE_URL_BASE}/${p})"
          url="$redirect_url/download/${f}/file"
-          echo Downloading curseforge mod $url
+          log Downloading curseforge mod $url
          #  Manifest usually doesn't have mod names. Using id should be fine, tho
          curl -sSL "${url}" -o $MOD_DIR/${p}_${f}.jar
        fi
      done
    else
-      echo "Could not find manifest file, unsufficient privs, or malformed path."
+      log "Could not find manifest file, unsufficient privs, or malformed path."
    fi
    ;;
  *)
-    echo "Invalid manifest file for modpack. Please make sure it is a .json file."
+    log "Invalid manifest file for modpack. Please make sure it is a .json file."
    ;;
 esac
 fi
@@ -124,7 +124,7 @@ if [[ "${GENERIC_PACK}" ]]; then
  if isURL "${GENERIC_PACK}"; then
    generic_pack_url=${GENERIC_PACK}
    GENERIC_PACK=/tmp/$(basename ${generic_pack_url})
-    echo "Downloading generic pack from ${generic_pack_url} ..."
+    log "Downloading generic pack from ${generic_pack_url} ..."
    curl -fsSL -o ${GENERIC_PACK} ${generic_pack_url}
  fi

@@ -133,9 +133,22 @@ if [[ "${GENERIC_PACK}" ]]; then
    base_dir=/tmp/generic_pack_base
    mkdir -p ${base_dir}
    unzip -q -d ${base_dir} ${GENERIC_PACK}
-    depth=$(( ${GENERIC_PACK_STRIP_DIRS:-1} + 1 ))
-    echo "Applying generic pack, stripping $(( depth - 1 )) level ..."
-    find ${base_dir} -type d -mindepth $depth -maxdepth $depth -exec cp -r {} /data/ +
+    if [ -f /data/manifest.txt ]; then
+      log "Manifest exists from older generic pack, cleaning up ..."
+      while read f; do
+        rm -rf "/data/${f}"
+      done < /data/manifest.txt
+      find /data/* -type d -exec rmdir --ignore-fail-on-non-empty {} +
+      rm -f /data/manifest.txt
+    fi
+    log "Writing generic pack manifest ... "
+    find ${base_dir} -type f -print0 | xargs -0 -I {} echo "{}" | sed "s#${base_dir}/##" > /data/manifest.txt
+    log "Applying generic pack ..."
+    IFS='
+'
+    set -f
+    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}
  fi
--- a/8
+++ b/8
@@ -1,11 +1,13 @@
 #!/bin/bash

+. /start-utils
+
 # If supplied with a URL for a config (simple zip of configurations), download it and unpack
 if [[ "$MODCONFIG" ]]; then
 case "X$MODCONFIG" in
  X[Hh][Tt][Tt][Pp]*[Zz][iI][pP])
-    echo "Downloading mod/plugin configs via HTTP"
-    echo "  from $MODCONFIG ..."
+    log "Downloading mod/plugin configs via HTTP"
+    log "  from $MODCONFIG ..."
    curl -sSL -o /tmp/modconfig.zip "$MODCONFIG"
    if [ "$TYPE" = "SPIGOT" ]; then
      mkdir -p /data/plugins
@@ -17,7 +19,7 @@ case "X$MODCONFIG" in
    rm -f /tmp/modconfig.zip
    ;;
  *)
-    echo "Invalid URL given for modconfig: Must be HTTP or HTTPS and a ZIP file"
+    log "Invalid URL given for modconfig: Must be HTTP or HTTPS and a ZIP file"
    ;;
 esac
 fi
--- a/23
+++ b/23
@@ -1,5 +1,7 @@
 #!/bin/bash

+. /start-utils
+
 # FUNCTIONS
 function setServerProp {
  local prop=$1
@@ -10,16 +12,16 @@ function setServerProp {
      TRUE|FALSE)
        var=${var,,} ;;
    esac
-    echo "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
+    log "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
    sed -i "/^${prop}\s*=/ c ${prop}=${var}" "$SERVER_PROPERTIES"
  else
-    echo "Skip setting ${prop}"
+    log "Skip setting ${prop}"
  fi
 }

 function customizeServerProps {
  if [ -n "$WHITELIST" ]; then
-    echo "Creating whitelist"
+    log "Creating whitelist"
    setServerProp "whitelist" "true"
    setServerProp "white-list" "true"
  fi
@@ -41,6 +43,7 @@ function customizeServerProps {
  fi

  setServerProp "server-name" "$SERVER_NAME"
+  setServerProp "server-ip" "$SERVER_IP"
  setServerProp "server-port" "$SERVER_PORT"
  setServerProp "motd" "$MOTD"
  setServerProp "allow-nether" "$ALLOW_NETHER"
@@ -89,7 +92,7 @@ function customizeServerProps {
        DIFFICULTY=3
        ;;
      *)
-        echo "DIFFICULTY must be peaceful, easy, normal, or hard."
+        log "DIFFICULTY must be peaceful, easy, normal, or hard."
        exit 1
        ;;
    esac
@@ -97,7 +100,7 @@ function customizeServerProps {
  fi

  if [ -n "$MODE" ]; then
-    echo "Setting mode"
+    log "Setting mode"
    MODE_LC=$( echo $MODE | tr '[:upper:]' '[:lower:]' )
    case $MODE_LC in
      0|1|2|3)
@@ -115,7 +118,7 @@ function customizeServerProps {
        MODE=3
        ;;
      *)
-        echo "ERROR: Invalid game mode: $MODE"
+        log "ERROR: Invalid game mode: $MODE"
        exit 1
        ;;
    esac
@@ -126,11 +129,11 @@ function customizeServerProps {
 # Deploy server.properties file
 if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
  export SERVER_PROPERTIES=${FTB_DIR}/server.properties
-  echo "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
+  log "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
 fi

 if [ ! -e "$SERVER_PROPERTIES" ]; then
-  echo "Creating server.properties in ${SERVER_PROPERTIES}"
+  log "Creating server.properties in ${SERVER_PROPERTIES}"
  cp /tmp/server.properties "$SERVER_PROPERTIES"
  customizeServerProps
 elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
@@ -139,11 +142,11 @@ elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
        customizeServerProps
        ;;
      *)
-        echo "server.properties already created, skipping"
+        log "server.properties already created, skipping"
        ;;
    esac
 else
-  echo "server.properties already created, skipping"
+  log "server.properties already created, skipping"
 fi

 exec /start-finalSetup05EnvVariables $@
--- a/6
+++ b/6
@@ -1,14 +1,16 @@
 #!/bin/bash

+. /start-utils
+
 if [ "${REPLACE_ENV_VARIABLES^^}" = "TRUE" ]; then
-  echo "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."
+  log "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."
  while IFS='=' read -r name value ; do
    # check if name of env variable matches the prefix
    # sanity check environment variables to avoid code injections
    if [[ "$name" = $ENV_VARIABLE_PREFIX* ]] \
        && [[ $value =~ ^[0-9a-zA-Z_:/=?.+\-]*$ ]] \
        && [[ $name =~ ^[0-9a-zA-Z_\-]*$ ]]; then
-      echo "Replacing $name with $value ..."
+      log "Replacing $name with $value ..."
      find /data/ -type f \
          \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" \
          -or -name "*.conf" -or -name "*.properties" \) \
--- a/134
+++ b/134
@@ -3,36 +3,48 @@
 . /start-utils

 if [ -n "$OPS" ]; then
-  echo "Setting/adding ops"
+  log "Setting/adding ops"
  rm -rf ops.txt.converted
  echo $OPS | awk -v RS=, '{print}' > ops.txt
 fi

 if [ -n "$WHITELIST" ]; then
-  echo "Setting whitelist"
+  log "Setting whitelist"
  rm -rf white-list.txt.converted
  echo $WHITELIST | awk -v RS=, '{print}' > white-list.txt
 fi

 if [ -n "$ICON" -a ! -e server-icon.png ]; then
-  echo "Using server icon from $ICON..."
+  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
-    echo "Converting image to 64x64 PNG..."
+    log "Converting image to 64x64 PNG..."
    convert /tmp/icon.img -resize 64x64! /data/server-icon.png
  fi
 fi

+if [ ${TYPE} != "SPIGOT" ]; then
+# Set up log configuration
+LOGFILE="/data/log4j2.xml"
+if [ ! -e "$LOGFILE" ]; then
+  log "Creating log4j2.xml in ${LOGFILE}"
+  cp /tmp/log4j2.xml "$LOGFILE"
+else
+  log "log4j2.xml already created, skipping"
+fi
+JVM_OPTS="-Dlog4j.configurationFile=/data/log4j2.xml ${JVM_OPTS}"
+fi
+
 # Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
-echo "Checking for JSON files."
+log "Checking for JSON files."
 JSON_FILES=$(find . -maxdepth 1 -name '*.json')
 for j in $JSON_FILES; do
-  if [[ $(python -c "print open('$j').read().strip()==''") = True ]]; then
-    echo "Fixing JSON $j"
+  if [[ $(cat "$j" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') == "" ]]; then
+    log "Fixing JSON $j"
    echo '[]' > $j
  fi
 done
@@ -41,7 +53,7 @@ done
 # If any modules have been provided, copy them over
 mkdir -p /data/mods
 if [ -d /mods ]; then
-  echo "Copying any mods over..."
+  log "Copying any mods over..."
  rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /mods /data
 fi

@@ -49,24 +61,26 @@ fi
 for c in /config/*
 do
  if [ -f "$c" ]; then
-    echo Copying configuration `basename "$c"`
+    log Copying configuration $(basename "$c")
    cp -rf "$c" /data/config
  fi
 done

-mkdir -p /data/plugins
-if [ "$TYPE" = "SPIGOT" ]; then
-  if [ -d /plugins ]; then
-    echo "Copying any Bukkit plugins over..."
-    # Copy plugins over using rsync to allow deeply nested updates of plugins
-    # only updates files if the source file is newer and print updated files
-    rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /plugins /data
-  fi
-fi
+case ${TYPE} in
+  SPIGOT|BUKKIT|PAPER)
+    mkdir -p /data/plugins
+    if [ -d /plugins ]; then
+      log "Copying plugins over..."
+      # Copy plugins over using rsync to allow deeply nested updates of plugins
+      # only updates files if the source file is newer and print updated files
+      rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /plugins /data
+    fi
+    ;;
+esac

 EXTRA_ARGS=""
 # Optional disable console
-if [[ ${CONSOLE} = false || ${CONSOLE} = FALSE ]]; then
+if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then
  EXTRA_ARGS+="--noconsole"
 fi

@@ -76,7 +90,7 @@ if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
 fi

 # put these prior JVM_OPTS at the end to give any memory settings there higher precedence
-echo "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}"
+log "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}"

 expandedDOpts=
 if [ -n "$JVM_DD_OPTS" ]; then
@@ -86,9 +100,81 @@ if [ -n "$JVM_DD_OPTS" ]; then
      done
 fi

-mcServerRunnerArgs="--stop-duration 60s"
+if isTrue ${ENABLE_JMX}; then
+  : ${JMX_HOST:=0.0.0.0}
+  : ${JMX_PORT:=7091}
+  JVM_OPTS="${JVM_OPTS}
+  -Dcom.sun.management.jmxremote.local.only=false
+  -Dcom.sun.management.jmxremote.port=${JMX_PORT}
+  -Dcom.sun.management.jmxremote.rmi.port=${JMX_PORT}
+  -Dcom.sun.management.jmxremote.authenticate=false
+  -Dcom.sun.management.jmxremote.ssl=false
+  -Dcom.sun.management.jmxremote.host=${JMX_HOST}
+  -Djava.rmi.server.hostname=${JMX_HOST}"
+
+  log "JMX is enabled. Make sure you have port forwarding for ${JMX_PORT}"
+fi
+
+if isTrue "${USE_AIKAR_FLAGS}"; then
+  # From https://mcflags.emc.gs/
+
+  if (( $(normalizeMemSize "${MAX_MEMORY}") >= $(normalizeMemSize 12g) )); then
+    log "Using Aikar's >12GB flags"
+    G1NewSizePercent=40
+    G1MaxNewSizePercent=50
+    G1HeapRegionSize=16M
+    G1ReservePercent=15
+    InitiatingHeapOccupancyPercent=20
+  else
+    log "Using Aikar's flags"
+    G1NewSizePercent=30
+    G1MaxNewSizePercent=40
+    G1HeapRegionSize=8M
+    G1ReservePercent=20
+    InitiatingHeapOccupancyPercent=15
+  fi
+
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UseG1GC -XX:+ParallelRefProcEnabled
+  -XX:MaxGCPauseMillis=200
+  -XX:+UnlockExperimentalVMOptions
+  -XX:+DisableExplicitGC
+  -XX:-OmitStackTraceInFastThrow
+  -XX:+AlwaysPreTouch
+  -XX:G1NewSizePercent=${G1NewSizePercent}
+  -XX:G1MaxNewSizePercent=${G1MaxNewSizePercent}
+  -XX:G1HeapRegionSize=${G1HeapRegionSize}
+  -XX:G1ReservePercent=${G1ReservePercent}
+  -XX:G1HeapWastePercent=5
+  -XX:G1MixedGCCountTarget=8
+  -XX:InitiatingHeapOccupancyPercent=${InitiatingHeapOccupancyPercent}
+  -XX:G1MixedGCLiveThresholdPercent=90
+  -XX:G1RSetUpdatingPauseTimePercent=5
+  -XX:SurvivorRatio=32
+  -XX:MaxTenuringThreshold=1
+  -Dusing.aikars.flags=true
+  -Daikars.new.flags=true
+  "
+fi
+
+if isTrue "${USE_LARGE_PAGES}"; then
+  JVM_XX_OPTS="${JVM_XX_OPTS}
+  -XX:+UseLargePagesInMetaspace
+  "
+fi
+
+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" ]]; then
+    mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash"

-if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
    if [ ! -e "${FTB_DIR}/ops.json" -a -e /data/ops.txt ]; then
      cp -f /data/ops.txt ${FTB_DIR}/
    fi
@@ -111,7 +197,7 @@ EOF
    fi

    cd "${FTB_DIR}"
-    echo "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
+    log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
    if isTrue ${DEBUG_EXEC}; then
      set -x
    fi
@@ -122,7 +208,7 @@ else
    bootstrapArgs="--bootstrap /data/bootstrap.txt"
  fi

-  echo "Starting the Minecraft server..."
+  log "Starting the Minecraft server..."
  JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
  if isTrue ${DEBUG_EXEC}; then
    set -x
--- a/40
+++ b/40
@@ -37,6 +37,44 @@ function isDebugging {

 function debug {
  if isDebugging; then
-    echo "DEBUG: $*"
+    log "DEBUG: $*"
  fi
 }
+
+function logn {
+  echo -n "[init] $*"
+}
+
+function log {
+  echo "[init] $*"
+}
+
+function normalizeMemSize {
+  local scale=1
+  case ${1,,} in
+    *k)
+      scale=1024;;
+    *m)
+      scale=1048576;;
+    *g)
+      scale=1073741824;;
+  esac
+
+  val=${1:0: -1}
+  echo $(( val * scale ))
+}
+
+function versionLessThan {
+  local activeParts
+  IFS=. read -ra activeParts <<< "${VANILLA_VERSION}"
+
+  local givenParts
+  IFS=. read -ra givenParts <<< "$1"
+
+  if (( activeParts[0] < givenParts[0] )) || \
+     (( activeParts[0] == givenParts[0] && activeParts[1] < givenParts[1] )); then
+    return 0
+  else
+    return 1
+  fi
+}
--- a/18
+++ b/18
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+. /start-utils
+
+if ! [[ -v CURSE_INSTANCE_JSON ]]; then
+  log "ERROR: CURSE_INSTANCE_JSON needs to be set"
+  exit 2
+elif ! [ -f "${CURSE_INSTANCE_JSON}" ] && [ -f "${CURSE_INSTANCE_JSON}/minecraftinstance.json" ]; then
+  CURSE_INSTANCE_JSON="${CURSE_INSTANCE_JSON}/minecraftinstance.json"
+elif ! [ -f "${CURSE_INSTANCE_JSON}" ]; then
+  log "ERROR: CURSE_INSTANCE_JSON file does not exist: ${CURSE_INSTANCE_JSON}"
+  exit 2
+fi
+
+log "Resolved CURSE_INSTANCE_JSON as ${CURSE_INSTANCE_JSON}"
+
+# Continue to Final Setup
+exec /start-finalSetup01World "$@"
Author	SHA1	Message	Date
Geoff Bourne	8dbbdd8cd2	Added logic to skip --noconsole on newer versions Fixes #452	2020-04-13 18:29:44 -05:00
Geoff Bourne	1c2a0c506c	Added support for TYPE=CURSE_INSTANCE	2020-04-12 14:31:19 -05:00
Chip Wolf ‮	90a6707280	Enable upgrades with GENERIC_PACK (#491 )	2020-04-12 09:39:28 -05:00
Geoff Bourne	e7cc54092a	Fixing health check description to reference mc-monitor For #426	2020-04-11 10:51:30 -05:00
Geoff Bourne	cd70cbcbea	Enhanced Aikar's flag logic to adjust for >12GB memory For #483	2020-04-11 10:41:20 -05:00
Geoff Bourne	7910005086	Added option to use Aikar's flags	2020-04-11 08:43:17 -05:00
Geoff Bourne	b8ace17b7c	ci: ignore non-amd64 branches	2020-04-10 15:33:16 -05:00
Geoff Bourne	f70814d6b6	Updated paper build example to use stdin/tty	2020-04-10 11:00:22 -05:00
Geoff Bourne	8440e57118	Fixed support for modpacks that has multiple forge jars HR New Beginnings was one such modpack	2020-04-10 10:59:30 -05:00
Julien Bérubé	29eda3530c	fixed the link to curseforge mod list (#487 )	2020-04-07 19:15:49 -05:00
Geoff Bourne	558544f1e4	Fixed WORLD cloning when path has spaces	2020-04-06 18:59:26 -05:00
Geoff Bourne	56c2f0b466	Disabled log4j config when TYPE=SPIGOT Helps #482	2020-04-05 17:32:26 -05:00
Geoff Bourne	4bbc7d142f	Fixed /plugins support for Paper servers	2020-04-04 10:13:51 -05:00
Geoff Bourne	26cc3943ce	Removed ToF buildtools section since that was moved downstream	2020-04-04 09:34:21 -05:00
Geoff Bourne	6521f45f0b	Added adopt13 to docker-versions-create.sh	2020-04-03 13:30:57 -05:00
Geoff Bourne	d62c2ffb42	Added ENABLE_JMX option	2020-04-03 12:32:46 -05:00
Geoff Bourne	d131941b62	Revert "Checking health of the container using SERVER_IP variable (#473 )" This reverts commit `6465bca6`	2020-04-02 10:14:22 -05:00
Geoff Bourne	98f0b36cfc	Changed FTB exec to always use shell For #469	2020-04-01 18:50:07 -05:00
Alexei	6465bca640	Checking health of the container using SERVER_IP variable (#473 )	2020-04-01 09:49:21 -05:00
Geoff Bourne	4ad447ba6c	Used shell when FTB server script missing shebang line For #467	2020-03-29 11:43:26 -05:00
Geoff Bourne	736979c20b	Removed description of FTB/CF URL option	2020-03-29 09:48:50 -05:00
Geoff Bourne	0c34a61332	Upgraded mc-server-runner to 1.3.5 Related to #467	2020-03-29 09:30:46 -05:00
Geoff Bourne	67d58678a3	Added grep in FTB logic to avoid re-adding queryResult flag Fixes #468	2020-03-29 08:55:53 -05:00
Geoff Bourne	fb92a74084	Added README section about running on raspberrypi	2020-03-28 14:05:16 -05:00
Geoff Bourne	8b5430ca44	Added textual link to full docs Fixes #448	2020-03-28 14:01:57 -05:00
Geoff Bourne	f24827f558	Removed forced creation of /mods and /config volumes Related to #464	2020-03-28 14:00:22 -05:00
Geoff Bourne	f49b967d5a	Added logging of given VERSION and TYPE	2020-03-28 13:56:48 -05:00
Geoff Bourne	111ca85c4f	Upgraded mc-server-runner to 1.3.4	2020-03-28 13:48:47 -05:00
Geoff Bourne	c73bedc63c	Removed logging change from docker-versions-create.sh	2020-03-26 20:53:10 -05:00
Geoff Bourne	6f67f76eef	Upgraded easy-add to 0.7.1	2020-03-26 20:50:13 -05:00
Geoff Bourne	002ed4bc77	Added armv7 to docker-versions-create.sh	2020-03-26 09:41:55 -05:00
Geoff Bourne	9d48e79c64	Added multiarch to docker-versions-create.sh	2020-03-25 20:13:05 -05:00
Geoff Bourne	ba7db26157	Added README section for Helm charts and examples (#461 )	2020-03-25 11:24:19 -05:00
Timo Meijer	fc6129261b	Add customized log file with 7 day retention (#455 )	2020-03-20 16:29:52 -05:00
Pascal Sthamer	7702d98766	Allow to modify server-ip in server.properties (#454 ) Needed when your machine has multiple ip adresses assigned and you want to host your server on another ip than the default one.	2020-03-20 09:56:50 -05:00
Alexei	04ed016175	Running Minecraft on a different Java version (#450 ) Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>	2020-03-16 10:06:35 -05:00
Geoff Bourne	1aaaf95950	Upgraded easy-add to 0.7.0	2020-03-14 15:42:28 -05:00
Malcolm Nihlén	1e334ca7d5	Added log prefixes (#444 )	2020-03-06 09:52:17 -06:00
Geoff Bourne	74df4b6a9c	Unified easy-add usage with multiarch and common 'file' template	2020-02-06 15:34:14 -06:00
Geoff Bourne	f63463e654	Removed mcadmin.jq since it was no longer used	2020-02-06 15:33:21 -06:00
Geoff Bourne	a24b633ccb	Added support for buildx multi-arch builds	2020-02-04 17:36:03 -06:00
Geoff Bourne	5b8cd8cdcc	Upgraded easy-add and used templated URLs	2020-02-02 15:16:09 -06:00
Geoff Bourne	c35c85e9b5	Included resolved version in bukkit/spigot jar name to support auto-update Fixes #431	2020-02-02 08:09:54 -06:00
Geoff Bourne	2ffc1641a0	Added a git pull when docker-versions-create.sh starts with each branch	2020-02-01 08:52:39 -06:00
Geoff Bourne	9d67dceff3	Removed the remaining use of python	2020-01-30 21:39:35 -06:00
Geoff Bourne	c449a31b37	Removed the need for xq	2020-01-30 21:24:36 -06:00
				`@@ -0,0 +1 @@`
				Download Bukkit/Spigot plugin jars, such as [WorldEdit](https://dev.bukkit.org/projects/worldedit/files) and place them here. At image build time the `COPY` step will place those jars in `/plugins`. At container startup, the contents of `/plugins` are sync'ed into `/data/plugins` for use with Bukkit/Spigot/Paper server types.