Auto-merging via docker-versions-create

# Conflicts:
#	Dockerfile
#	start-configuration

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,32 +0,0 @@
-name: Bug Report
-description: File a bug report
-labels:
-  - bug
-  - status/needs triage
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to report a bug.
-        
-        Please double check some things first:
-        - Do you just have a question about something? If so, asking in the [Q&A Discussions](https://github.com/itzg/docker-minecraft-server/discussions/categories/q-a) or asking on [the Discord server](https://discord.gg/DXfKpjB) would be best.
-        - Is this bug happening after the `[init]` prefixed logs and after the log that says "Starting the Minecraft server"? If so, please report the bug with Mojang or the respective server provider.
-        - Are you seeing a performance problem? If so, that is typically outside the scope of the image setup mechanims. Ask a question as above or contact the respective server provider.
-  - type: textarea
-    id: problem
-    attributes:
-      label: Describe the problem
-    validations:
-      required: true
-  - type: textarea
-    id: container
-    attributes:
-      label: Container definition
-      description: Please provide the compose file or run command used to create the container
-  - type: textarea
-    id: logs
-    attributes:
-      label: Container logs
-      description: |
-        Please provide container logs from the start of the container, which will be the ones prefixed with `[init]`. It is even better if you can set the variable `DEBUG` to "true" and provide those debug container logs.

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,29 +0,0 @@
-name: Enhancement Request
-description: Request an enhancement
-labels:
-  - enhancement
-  - status/needs triage
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to request an enhancement.
-        
-        Even if you plan on submitting a pull request with a contributed enhancement it is best to describe the enhancement here first. Somebody might already be working on a similar thing and could use your help.
-  - type: dropdown
-    id: type
-    attributes:
-      label: Enhancement Type
-      options:
-        - Improve an existing feature
-        - A completely new feature
-        - New server type
-        - Not sure
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the enhancement
-    validations:
-      required: true

.github/no-response.yml

@@ -0,0 +1,6 @@
+daysUntilClose: 14
+responseRequiredLabel: "status/waiting on feedback"
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  after requesting feedback. Please feel free to re-open this issue if the
+  scenario still exists and provide a comment with more information.

.github/workflows/build-multiarch.yml

@@ -3,15 +3,16 @@ on:
   push:
     branches:
       - master
-      - java8-multiarch
+      - "*-multiarch"
+      - "multiarch*"
       - java8-openj9
       - java11*
       - java16*
-      - java17*
       - test/*
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+-java8-multiarch"
+      - "[0-9]+.[0-9]+.[0-9]+-multiarch*"
+      - "[0-9]+.[0-9]+.[0-9]+-*multiarch"
       - "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
       - "[0-9]+.[0-9]+.[0-9]+-java11*"
       - "[0-9]+.[0-9]+.[0-9]+-java16*"
@@ -26,7 +27,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v2.3.4
 
       - name: Docker meta
         id: meta

.github/workflows/generate-toc.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.3.4
       - run: |
           curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc
           chmod a+x gh-md-toc

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.3.4
 
       - name: Run tests
         run: |
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.3.4
 
     - name: Prepare
       id: prep

.github/workflows/pr.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.3.4
 
       - name: Run tests
         run: |

.github/workflows/stale-check.yml

@@ -1,26 +0,0 @@
-name: Stale Check
-
-on:
-  issue_comment:
-  schedule:
-    - cron: 0 2 * * *
-
-jobs:
-  check:
-    runs-on: ubuntu-20.04
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - name: Process Stale Issues
-        uses: actions/stale@v4.0.0
-        with:
-          stale-issue-label: status/stale
-          stale-pr-label: status/stale
-          stale-issue-message: >
-            This issue is stale because it has been open 30 days with no activity. 
-            Please add a comment describing the reason to keep this issue open.
-          days-before-stale: 30
-          days-before-close: 5
-          exempt-issue-labels: 'enhancement,keep,status/needs triage'
-

DEVELOPMENT.md

@@ -2,10 +2,10 @@
 
 Adding a new server `TYPE` can vary due to the complexity of obtaining and configuring each type; however, the addition of any server type includes at least the following steps:
 
-1. Copy an existing "start-deploy*" script, such as [start-deployMohist](scripts/start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix
+1. Copy an existing "start-deploy*" script, such as [start-deployMohist](start-deployMohist) and rename it accordingly making sure to retain the "start-deploy" prefix
 2. Modify the type-specific behavior between the "start-utils" preamble and the hand-off to `start-setupWorld` at the end of the script 
 3. Develop and test the changes using the [iterative process described below](#iterative-script-development)
-4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](scripts/start-configuration)
+4. Add a case-entry to the `case "${TYPE^^}"` in [start-configuration](start-configuration)
 5. Add a section to the [README](README.md). It is recommended to copy-modify an existing section to retain a similar wording and level of detail
 6. [Submit a pull request](https://github.com/itzg/docker-minecraft-server/pulls)
 
@@ -40,29 +40,6 @@ VANILLA_VERSION=1.12.2 /scripts/start-magma
 
 > NOTE: You may want to temporarily add an `exit` statement near the end of your script to isolate execution to just the script you're developing.
 
-## Using development copy of mc-image-helper
-
-In the cloned copy of [`mc-image-helper`](https://github.com/itzg/mc-image-helper), create an up-to-date snapshot build of the tgz distribution using:
-
-```shell
-./gradlew distTar
-```
-
-Assuming [http-server](https://www.npmjs.com/package/http-server) is installed globally, start a static web server using:
-
-```shell
-http-server ./build/distributions -p 0
-```
-
-Note the port that was selected by http-server and pass the build arguments, such as:
-
-```shell
---build-arg MC_HELPER_VERSION=1.8.1-SNAPSHOT \
---build-arg MC_HELPER_BASE_URL=http://host.docker.internal:8080
-```
-
-Now the image can be built like normal and it will install mc-image-helper from the locally built copy.
-
 ## Multi-base-image variants
 
 Several base-image variants are maintained in order to offer choices in JDK provider and version. The variants are maintained in their respective branches:

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk
+FROM adoptopenjdk:8-jre-hotspot
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
@@ -60,13 +60,14 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
  --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
  --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.9.6
-ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}
-RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
+ARG MC_HELPER_VERSION=1.6.1
+RUN curl -fsSL https://github.com/itzg/mc-image-helper/releases/download/v${MC_HELPER_VERSION}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
     | tar -C /usr/share -zxf - \
     && ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
 
 VOLUME ["/data"]
+COPY server.properties /tmp/server.properties
+COPY log4j2.xml /tmp/log4j2.xml
 WORKDIR /data
 
 STOPSIGNAL SIGTERM
@@ -79,12 +80,11 @@ ENV UID=1000 GID=1000 \
   ENABLE_AUTOPAUSE=false AUTOPAUSE_TIMEOUT_EST=3600 AUTOPAUSE_TIMEOUT_KN=120 AUTOPAUSE_TIMEOUT_INIT=600 \
   AUTOPAUSE_PERIOD=10 AUTOPAUSE_KNOCK_INTERFACE=eth0
 
-COPY scripts/start* /
+COPY start* /
 COPY bin/ /usr/local/bin/
 COPY bin/mc-health /health.sh
-COPY files/server.properties /tmp/server.properties
-COPY files/log4j2.xml /tmp/log4j2.xml
-COPY files/autopause /autopause
+
+ADD files/autopause /autopause
 
 RUN dos2unix /start* && chmod +x /start* \
     && dos2unix /autopause/* && chmod +x /autopause/*.sh

README.md

@@ -52,7 +52,6 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Running a SpongeVanilla server](#running-a-spongevanilla-server)
       * [Running a Fabric Server](#running-a-fabric-server)
       * [Running a Limbo server](#running-a-limbo-server)
-      * [Running a Crucible server](#running-a-crucible-server)
    * [Running a server with a Feed the Beast modpack](#running-a-server-with-a-feed-the-beast-modpack)
       * [Environment Variables:](#environment-variables)
       * [Upgrading](#upgrading)
@@ -65,8 +64,6 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Optional plugins, mods, and config attach points](#optional-plugins-mods-and-config-attach-points)
       * [Auto-downloading SpigotMC/Bukkit/PaperMC plugins](#auto-downloading-spigotmcbukkitpapermc-plugins)
       * [Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers](#downloadable-modplugin-pack-for-forge-bukkit-and-spigot-servers)
-      * [Generic pack file](#generic-pack-file)
-      * [Mod/Plugin URL Listing File](#modplugin-url-listing-file)
       * [Remove old mods/plugins](#remove-old-modsplugins)
    * [Working with world data](#working-with-world-data)
       * [Downloadable world](#downloadable-world)
@@ -131,9 +128,8 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Description](#description)
       * [Enabling Autopause](#enabling-autopause)
    * [Running on RaspberryPi](#running-on-raspberrypi)
-   * [Contributing](#contributing)
 
-<!-- Added by: runner, at: Fri Nov  5 02:00:06 UTC 2021 -->
+<!-- Added by: runner, at: Sat Oct  9 16:34:51 UTC 2021 -->
 
 <!--te-->
 
@@ -224,8 +220,6 @@ services:
       - ./minecraft-data:/data
 ```
 
-> NOTE: if you have SELinux enabled, then you might need to add `:Z` to the end of volume mount specifications, [as described here](https://prefetch.net/blog/2017/09/30/using-docker-volumes-on-selinux-enabled-servers/).
-
 ### Converting anonymous `/data` volume to named volume
 
 If you had used the commands in the first section, without the `-v` volume attachment, then an anonymous data volume was created by Docker. You can later bring over that content to a named or host attached volume using the following procedure.
@@ -282,13 +276,13 @@ To use a different version of Java, please use a docker tag to run your Minecraf
 | java11-openj9  | 11           | Debian | OpenJ9   | amd64             |
 | java16         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java16-openj9  | 16           | Debian | OpenJ9   | amd64             |
-| java17         | 17           | Ubuntu | Hotspot  | amd64,arm64,armv7 |
+| multiarch-latest | 15+        | Debian | Hotspot  | amd64,arm64,armv7 |
 
 For example, to use Java version 16 on any supported architecture:
 
     docker run --name mc itzg/minecraft-server:java16
 
-> Keep in mind that some versions of Minecraft server, such as Forge before 1.17, can't work on the newest versions of Java. Instead, one of the Java 8 images should be used. Also, FORGE doesn't support openj9 JVM implementation.
+> 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
 
@@ -297,7 +291,6 @@ The following image tags have been deprecated and are no longer receiving update
 - adopt14
 - adopt15
 - openj9-nightly
-- multiarch-latest
 
 ## Healthcheck
 
@@ -415,7 +408,7 @@ If you are hosting your own copy of Bukkit/Spigot you can override the download
 
 You can build spigot from source by adding `-e BUILD_FROM_SOURCE=true`
 
-Plugins can either be managed within the `plugins` subdirectory of the [data directory](#data-directory) or you can also [attach a `/plugins` volume](#optional-plugins-mods-and-config-attach-points). If you add plugins while the container is running, you'll need to restart it to pick those up.
+Plugins can either be managed within the `plugins` subdirectory of the [data directory](#data-directory) or 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.
 
 [You can also auto-download plugins using `SPIGET_RESOURCES`.](#auto-downloading-spigotmcbukkitpapermc-plugins)
 
@@ -439,7 +432,7 @@ If you are hosting your own copy of Paper you can override the download URL with
 An example compose file is provided at
 [examples/docker-compose-paper.yml](examples/docker-compose-paper.yml).
 
-If you have attached a host directory to the `/data` volume, then you can install plugins via the `plugins` subdirectory. You can also [attach a `/plugins` volume](#optional-plugins-mods-and-config-attach-points). If you add plugins while the container is running, you'll need to restart it to pick those up.
+If you have attached a host directory to the `/data` volume, then you can install plugins via 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.
 
 [You can also auto-download plugins using `SPIGET_RESOURCES`.](#auto-downloading-spigotmcbukkitpapermc-plugins)
 
@@ -482,8 +475,6 @@ By default, the "stable" channel is used, but you can set `MAGMA_CHANNEL` to "de
 
 ### Running a Mohist server
 
-> **CAUTION** Be sure to [read this article](https://essentialsx.net/do-not-use-mohist.html) to understand the risks associated with using Mohist.
-
 A [Mohist](https://github.com/MohistMC/Mohist) server can be used with
 
     -e TYPE=MOHIST
@@ -519,14 +510,11 @@ By default the latest build will be used; however, a specific build number can b
 ### Running a SpongeVanilla server
 
 Enable SpongeVanilla server mode by adding a `-e TYPE=SPONGEVANILLA` to your command-line.
-    
 By default the container will run the latest `STABLE` version.
 If you want to run a specific version, you can add `-e SPONGEVERSION=1.11.2-6.1.0-BETA-19` to your command-line.
 
-Beware that current [Sponge](https://www.spongepowered.org) `STABLE` versions for Minecraft 1.12 require using [the Java 8 tag](#running-minecraft-server-on-different-java-version):
-    
     docker run -d -v /path/on/host:/data -e TYPE=SPONGEVANILLA \
-        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server:java8-multiarch
+        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 
 You can also choose to use the `EXPERIMENTAL` branch.
 Just change it with `SPONGEBRANCH`, such as:
@@ -560,13 +548,6 @@ docker run -d -v /path/on/host:/data ... \
     -e FABRIC_INSTALLER_URL=http://HOST/fabric-installer-0.5.0.32.jar ...
 ```
 
-A specific loader version can be requested using `FABRIC_LOADER_VERSION`, such as:
-
-```
-docker run -d -v /path/on/host:/data ... \
-    -e FABRIC_LOADER_VERSION=0.11.7
-```
-
 In order to add mods, you have two options:
 
 ### Running a Limbo server
@@ -583,16 +564,6 @@ Configuration options with defaults:
 - `LIMBO_SCHEMA_FILENAME`=default.schem
 - `LEVEL`="Default;${LIMBO_SCHEMA_FILENAME}"
 
-### Running a Crucible server
-
-A [Crucible](https://github.com/CrucibleMC/Crucible) server can be run by setting `TYPE` to `CRUCIBLE`.
-
-Configuration options with defaults:
-
-- `CRUCIBLE_RELEASE`=latest
-
-Crucible is only available for 1.7.10, so be sure to set `VERSION=1.7.10`.
-
 ## 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).
@@ -723,42 +694,14 @@ You may also download or copy over individual mods using the `MODS` environment
 
   docker run -d -e MODS=https://www.example.com/mods/mod1.jar,/plugins/common,/plugins/special/mod2.jar ...
 
-### Generic pack file
-
-To install all of the server content (jars, mods, plugins, configs, etc) from a zip file, such as a CurseForge modpack that is missing a server start script, then set `GENERIC_PACK` to the container path of the zip file. That, combined with `TYPE`, allows for custom content along with container managed server download and install.  
-
-If multiple generic packs need to be applied together, set `GENERIC_PACKS` instead, with a comma separated list of zip file paths and/or URLs to zip files.
-
-### Mod/Plugin URL Listing File 
-
-As an alternative to `MODS`, the variable `MODS_FILE` can be set with the path to a text file listing a mod/plugin URL on each line. For example, the following
-
-     -e MODS_FILE=/extras/mods.txt
-
-would load from a file mounted into the container at `/extras/mods.txt`. That file might look like:
-
-```text
-https://edge.forgecdn.net/files/2965/233/Bookshelf-1.15.2-5.6.40.jar
-https://edge.forgecdn.net/files/2926/27/ProgressiveBosses-2.1.5-mc1.15.2.jar
-# This and next line are ignored
-#https://edge.forgecdn.net/files/3248/905/goblintraders-1.3.1-1.15.2.jar
-https://edge.forgecdn.net/files/3272/32/jei-1.15.2-6.0.3.16.jar
-https://edge.forgecdn.net/files/2871/647/ToastControl-1.15.2-3.0.1.jar
-```
-> Blank lines and lines that start with a `#` will be ignored
-
-> [This compose file](examples/docker-compose-mods-file.yml) shows another example of using this feature.
-
-> It is recommended to combine this option with `REMOVE_OLD_MODS=TRUE` to ensure the mods/plugins remain consistent with the file's listing.
-
 ### Remove old mods/plugins
 
 When the option above is specified (`MODPACK`) you can also instruct script to
 delete old mods/plugins prior to installing new ones. This behaviour is desirable
 in case you want to upgrade mods/plugins from downloaded zip file.
-To use this option pass the environment variable `REMOVE_OLD_MODS=TRUE`, such as
+To use this option pass the environment variable `REMOVE_OLD_MODS="TRUE"`, such as
 
-    docker run -d -e REMOVE_OLD_MODS=TRUE -e MODPACK=http://www.example.com/mods/modpack.zip ...
+    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.
@@ -798,15 +741,18 @@ The world will only be downloaded or copied if it doesn't exist already. Set `FO
 
 ## Server configuration
 
-By default, the server configuration will be created and set based on the following environment variables, but only the first time the server is started. If the `server.properties` file already exists, the values in them will not be changed.
+By default the server configuration will be created and set based on the following
+environment variables, but only the first time the server is started. If the
+`server.properties` file already exists, the values in them will not be changed.
 
-If you would like to override the server configuration each time the container starts up, you can set the `OVERRIDE_SERVER_PROPERTIES` environment variable like:
+If you would like to override the server configuration each time the container
+starts up, you can set the OVERRIDE_SERVER_PROPERTIES environment variable like:
 
     docker run -d -e OVERRIDE_SERVER_PROPERTIES=true ...
 
-This will reset any manual configuration of the `server.properties` file, so if you want to make any persistent configuration changes you will need to make sure you have properly set the proper environment variables in your container configuration.
-
-In the opposite case, you can skip the startup script's creation of `server.properties`, by setting `SKIP_SERVER_PROPERTIES` to "true".
+This will reset any manual configuration of the `server.properties` file, so if
+you want to make any persistent configuration changes you will need to make sure
+you have properly set the proper environment variables in your docker run command (described below).
 
 ### Message of the Day
 
@@ -1287,16 +1233,13 @@ The values of all three are passed directly to the JVM and support format/units
 
     -e MEMORY=2G
 
-To let the JVM calculate the heap size from the container declared memory limit, unset `MEMORY` with an empty value, such as `-e MEMORY=""`. By default, the JVM will use 25% of the container memory limit as the heap limit; however, as an example the following would tell the JVM to use 75% of the container limit of 2GB of memory:
-
-     -e MEMORY="" -e JVM_XX_OPTS="-XX:MaxRAMPercentage=75" -m 2000M
-
-> 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).
+> 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`
-environment variable. The JVM requires `-XX` options to precede `-X` options, so those can be declared in `JVM_XX_OPTS`. Both variables are space-delimited, raw JVM arguments.
+environment variable. Options like `-X` that need to proceed general JVM options can be passed
+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`.
@@ -1452,7 +1395,3 @@ To run this image on a RaspberryPi 3 B+, 4, or newer, use any of the image tags
 > NOTE: you may need to lower the memory allocation, such as `-e MEMORY=750m`
 
 > If experiencing issues such as "sleep: cannot read realtime clock: Operation not permitted", ensure `libseccomp` is up to date on your host. In some cases adding `:Z` flag to the `/data` mount may be needed, [but use cautiously](https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label).
-
-## Contributing
-    
-See [Development](DEVELOPMENT.md) and [Building](BUILDING.md).

docker-versions-create.sh

@@ -9,7 +9,7 @@ branches_list=(
   'java11-openj9'
   'java16'
   'java16-openj9'
-  'java17'
+  'multiarch-latest'
   )
 
 function TrapExit {

examples/.gitignore

@@ -1 +0,0 @@
-/data/

examples/docker-compose-curseforge.yml

@@ -2,18 +2,12 @@ version: '3.8'
 
 services:
   mc:
-    image: itzg/minecraft-server:${IMAGE_TAG:-java8}
+    image: itzg/minecraft-server:java8
     volumes:
     - ./modpacks:/modpacks:ro
-    - data:/data
     environment:
       EULA: "true"
       TYPE: CURSEFORGE
-      CF_SERVER_MOD: https://media.forgecdn.net/files/3482/169/Valhelsia+3-3.4.4-SERVER.zip
-#      CF_SERVER_MOD: https://media.forgecdn.net/files/3012/800/SkyFactory-4_Server_4.2.2.zip
-#      CF_SERVER_MOD: /modpacks/${MODPACK:-SkyFactory_4_Server_4.1.0.zip}
+      CF_SERVER_MOD: /modpacks/SkyFactory_4_Server_4.1.0.zip
     ports:
-      - "25565:25565"
-
-volumes:
-  data: {}
+      - 25565:25565

examples/docker-compose-forge.yml

@@ -2,16 +2,15 @@ version: "3.8"
 
 services:
   mc:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java8
     ports:
     # expose the Minecraft server port outside of container
-    - "25565:25565"
+    - 25565:25565
     environment:
       # REQUIRED for all types
       EULA: "TRUE"
       # Set server type (vs the default of vanilla)
       TYPE: FORGE
-      DEBUG: "true"
     volumes:
     # use a named, managed volume for data volume
     - mc_forge:/data

examples/docker-compose-ftba.yml

@@ -3,7 +3,7 @@ version: "3.8"
 services:
   mc:
     # FTBA support is only available in non-Alpine images
-    image: itzg/minecraft-server:${IMAGE_TAG:-java8-multiarch}
+    image: itzg/minecraft-server:java8-multiarch
     ports:
       # expose the Minecraft server port outside of container
       - 25565:25565
@@ -14,11 +14,10 @@ services:
       TYPE: FTBA
       # Use Pack ID from https://ftb.neptunepowered.org/pack/ftb-presents-direwolf20-1-12/
       FTB_MODPACK_ID: "31"
-      FTB_MODPACK_VERSION_ID: ""
     volumes:
       # use a named, managed volume for data volume
-      - ftba:/data
+      - mc_ftb:/data
 
 volumes:
   # declared the named volume, but use default/local storage engine
-  ftba: {}
+  mc_ftb: {}

examples/docker-compose-generic-pack.yml

@@ -1,20 +0,0 @@
-version: '3.8'
-
-services:
-  mc:
-    image: itzg/minecraft-server:${IMAGE_TAG:-latest}
-    volumes:
-    - data:/data
-    - ./modpacks:/modpacks:ro
-    environment:
-      EULA: "true"
-      TYPE: FORGE
-      DEBUG: "${DEBUG:-false}"
-      VERSION: ${VERSION:-1.17.1}
-      FORGEVERSION: ${FORGEVERSION:-37.0.90}
-      GENERIC_PACK: /modpacks/${MODPACK:-Server-Files-0.0.21.zip}
-    ports:
-      - "25565:25565"
-
-volumes:
-  data: {}

examples/docker-compose-mods-file.yml

@@ -1,19 +0,0 @@
-version: '3.8'
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-      TYPE: FORGE
-      VERSION: 1.15.2
-      MODS_FILE: /extras/mods.txt
-      REMOVE_OLD_MODS: "true"
-    ports:
-      - 25565:25565
-    volumes:
-      - data:/data
-      - ./mods.txt:/extras/mods.txt:ro
-
-volumes:
-  data:

examples/docker-compose-mohist.yml

@@ -1,17 +0,0 @@
-version: "3.8"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    ports:
-      - "25565:25565"
-    environment:
-      EULA: "TRUE"
-      TYPE: MOHIST
-      VERSION: 1.12.2
-      DEBUG: "true"
-    volumes:
-      - data:/data
-
-volumes:
-  data: {}

examples/mods.txt

@@ -1,80 +0,0 @@
-https://edge.forgecdn.net/files/2965/233/Bookshelf-1.15.2-5.6.40.jar
-https://edge.forgecdn.net/files/2926/27/ProgressiveBosses-2.1.5-mc1.15.2.jar
-https://edge.forgecdn.net/files/3248/905/goblintraders-1.3.1-1.15.2.jar
-https://edge.forgecdn.net/files/3272/32/jei-1.15.2-6.0.3.16.jar
-https://edge.forgecdn.net/files/2871/647/ToastControl-1.15.2-3.0.1.jar
-https://edge.forgecdn.net/files/3101/903/Druidcraft-1.15-0.4.45.jar
-https://edge.forgecdn.net/files/2880/426/DefaultOptions_1.15.2-11.0.1.jar
-https://edge.forgecdn.net/files/2996/535/MekanismAdditions-1.15.2-9.10.9.422.jar
-https://edge.forgecdn.net/files/3147/275/blockcarpentry-1.15-0.8.2.jar
-https://edge.forgecdn.net/files/3005/715/refinedstorageaddons-0.6.3.jar
-https://edge.forgecdn.net/files/3140/146/rftoolsbase-1.15-1.1.10.jar
-https://edge.forgecdn.net/files/3236/649/cc-tweaked-1.15.2-1.95.3.jar
-https://edge.forgecdn.net/files/3048/970/light-overlay-4.7.2.jar
-https://edge.forgecdn.net/files/3015/904/randompatches-1.15.2-1.22.1.1.jar
-https://edge.forgecdn.net/files/3131/439/engineersdecor-1.15.2-1.1.4.jar
-https://edge.forgecdn.net/files/3051/255/carryon-1.15.2-1.13.0.5.jar
-https://edge.forgecdn.net/files/3175/752/EnderStorage-1.15.2-2.5.2.164-universal.jar
-https://edge.forgecdn.net/files/2997/84/Savage-and-Ravage-1.15.2-1.1.4.jar
-https://edge.forgecdn.net/files/3053/840/PackMenu-1.15.2-1.2.8.jar
-https://edge.forgecdn.net/files/3003/397/JEITweaker-1.15.2-1.0.1.3.jar
-https://edge.forgecdn.net/files/3069/489/absentbydesign-1.15.2-1.1.1.jar
-https://edge.forgecdn.net/files/2997/601/Upgrade-Aquatic-1.15.2-1.7.1.jar
-https://edge.forgecdn.net/files/2950/766/ReAuth-1.14-1.15-3.8.1.jar
-https://edge.forgecdn.net/files/3024/179/Powah-1.15.2-1.1.15.jar
-https://edge.forgecdn.net/files/3092/975/StorageDrawers-1.15.2-7.0.3.jar
-https://edge.forgecdn.net/files/2853/267/furniture-7.0.0-pre16-1.15.1.jar
-https://edge.forgecdn.net/files/2987/251/AppleSkin-mc1.15.2-forge-1.0.14.jar
-https://edge.forgecdn.net/files/2980/323/industrial-foregoing-1.15.2-2.3.3-e356e61.jar
-https://edge.forgecdn.net/files/3024/178/Lollipop-1.15.2-1.0.16.jar
-https://edge.forgecdn.net/files/3210/106/tablechair-1.4.jar
-https://edge.forgecdn.net/files/3047/358/xercapaint-1.15.2-3.3.jar
-https://edge.forgecdn.net/files/2873/657/BonsaiTrees-2.1.2.6.jar
-https://edge.forgecdn.net/files/2938/583/config-2-3.0.jar
-https://edge.forgecdn.net/files/2991/235/Waystones_1.15.2-6.0.2.jar
-https://edge.forgecdn.net/files/2957/23/OpenLoader-1.15.2-4.0.5.jar
-https://edge.forgecdn.net/files/3275/718/XaerosWorldMap_1.13.2_Forge_1.15.2.jar
-https://edge.forgecdn.net/files/2876/104/AI-Improvements-1.15.2-0.3.0.jar
-https://edge.forgecdn.net/files/3005/515/mysticallib-1.15.2-2.0.1.jar
-https://edge.forgecdn.net/files/3008/867/WAWLA-1.15.2-3.0.4.jar
-https://edge.forgecdn.net/files/2964/474/WailaHarvestability-mc1.15.2-1.1.12.jar
-https://edge.forgecdn.net/files/3103/508/Kiwi-1.15.2-2.8.5.jar
-https://edge.forgecdn.net/files/3128/662/Atum-1.15.2-2.1.12.jar
-https://edge.forgecdn.net/files/2988/910/Buzzier-Bees-1.15.2-1.5.2.jar
-https://edge.forgecdn.net/files/3030/627/u_team_core-1.15.2-3.0.2.169.jar
-https://edge.forgecdn.net/files/3003/984/SilentLib-1.15.2-4.6.6+59.jar
-https://edge.forgecdn.net/files/2968/353/refinedpipes-0.4.2.jar
-https://edge.forgecdn.net/files/3140/149/rftoolsbuilder-1.15-2.1.16.jar
-https://edge.forgecdn.net/files/3067/203/mightyarchitect-mc1.15.2_v0.5.jar
-https://edge.forgecdn.net/files/2980/153/EquipmentTooltips-1.15.2-1.4.3+14.jar
-https://edge.forgecdn.net/files/3103/510/FruitTrees-1.15.2-1.7.0.jar
-https://edge.forgecdn.net/files/2989/38/Atmospheric-1.15.2-1.4.1.jar
-https://edge.forgecdn.net/files/3096/836/rftoolscontrol-1.15-3.0.9.jar
-https://edge.forgecdn.net/files/2989/662/Enhanced-Mushrooms-1.15.2-v1.2.2.jar
-https://edge.forgecdn.net/files/3227/891/SimpleStorageNetwork-1.15.2-1.0.2.jar
-https://edge.forgecdn.net/files/3217/290/minecolonies-0.13.645-RELEASE-universal.jar
-https://edge.forgecdn.net/files/2935/384/SnowRealMagic-1.15.2-1.7.5.jar
-https://edge.forgecdn.net/files/2988/584/aiotbotania-1.15.2-1.2.3.jar
-https://edge.forgecdn.net/files/3255/408/mowziesmobs-1.5.15.jar
-https://edge.forgecdn.net/files/3062/510/HealthOverlay-1.15.2-1.0.2.jar
-https://edge.forgecdn.net/files/3023/121/neoncraft-1.1.jar
-https://edge.forgecdn.net/files/2997/617/Swamp-Expansion-1.15.2-1.7.3.jar
-https://edge.forgecdn.net/files/2980/252/titanium-1.15.2-2.4.2.jar
-https://edge.forgecdn.net/files/3152/946/rftoolsutility-1.15-2.1.20.jar
-https://edge.forgecdn.net/files/3083/277/swingthroughgrass-1.15.2-1.4.1.jar
-https://edge.forgecdn.net/files/3138/530/SilentGear-1.15.2-1.11.4+187.jar
-https://edge.forgecdn.net/files/3105/429/DarkUtilities-1.15.2-3.1.9.jar
-https://edge.forgecdn.net/files/3099/23/ImmersiveEngineering-1.15.2-4.1.1-125.jar
-https://edge.forgecdn.net/files/2856/529/FastFurnace-1.15.1-3.0.0.jar
-https://edge.forgecdn.net/files/2988/999/BiomesOPlenty-1.15.2-10.0.0.366-universal.jar
-https://edge.forgecdn.net/files/2989/95/The-Endergetic-Expansion-1.15.2-v1.3.2.jar
-https://edge.forgecdn.net/files/2993/960/FluxNetworks-1.15.2-5.0.3-4.jar
-https://edge.forgecdn.net/files/3028/611/ServerTabInfo-1.15.2-1.2.8.jar
-https://edge.forgecdn.net/files/3134/277/fairylights-3.0.15-1.15.2.jar
-https://edge.forgecdn.net/files/3048/54/useful_backpacks-1.15.2-1.10.3.77.jar
-https://edge.forgecdn.net/files/3273/515/mcw-trapdoors-1.0.2-mc1.15.2.jar
-https://edge.forgecdn.net/files/2986/639/CraftingTweaks_1.15.2-11.0.1.jar
-https://edge.forgecdn.net/files/3261/454/create-mc1.15.2_v0.3.1a.jar
-https://edge.forgecdn.net/files/3211/10/supermartijn642configlib-1.0.5-mc1.15.jar
-https://edge.forgecdn.net/files/2995/786/TerraForged-1.15.2-0.0.15.jar
-https://edge.forgecdn.net/files/2892/562/leavesdecayonotherleaves-1.1.jar

minecraft-server/README.md

@@ -0,0 +1,4 @@
+# Moved to top-level
+
+The contents of this directory have now been moved to the top level of
+[itzg/docker-minecraft-server](https://github.com/itzg/docker-minecraft-server).

scripts/start-deployCrucible

@@ -1,60 +0,0 @@
-#!/bin/bash
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-$(dirname "$0")}/start-utils"
-set -o pipefail
-set -e
-isDebugging && set -x
-
-requireVar VANILLA_VERSION
-: "${CRUCIBLE_RELEASE:=latest}"
-
-crucibleReleasesUrl=https://api.github.com/repos/CrucibleMC/Crucible/releases
-if [[ ${CRUCIBLE_RELEASE^^} = LATEST ]]; then
-  crucibleReleaseUrl=${crucibleReleasesUrl}/latest
-else
-  crucibleReleaseUrl=${crucibleReleasesUrl}/tags/${CRUCIBLE_RELEASE}
-fi
-
-if ! downloadUrl=$(get --json-path "$.assets[?(@.name =~ /Crucible-${VANILLA_VERSION}-.*\.jar/)].browser_download_url" \
-    --accept "application/vnd.github.v3+json" "$crucibleReleaseUrl"); then
-  log "ERROR: failed to access ${CRUCIBLE_RELEASE} release of Crucible"
-  exit 1
-fi
-
-if [[ $downloadUrl = null ]]; then
-  log "ERROR: failed to locate Crucible jar for $VANILLA_VERSION from ${CRUCIBLE_RELEASE}"
-  exit 1
-fi
-
-log "Downloading Crucible from $downloadUrl"
-if ! SERVER=$(get --skip-existing --output-filename -o /data "$downloadUrl"); then
-  log "ERROR: failed to download Crucible jar from $downloadUrl"
-  exit 1
-fi
-
-librariesDir=/data/libraries
-if [ ! -d "$librariesDir" ]; then
-  if ! librariesUrl=$(get --json-path "$.assets[?(@.name == 'libraries.zip')].browser_download_url" \
-      --accept "application/vnd.github.v3+json" "$crucibleReleaseUrl"); then
-    log "ERROR: failed to access ${CRUCIBLE_RELEASE} release of Crucible for libraries"
-    exit 1
-  fi
-
-  log "Downloading Crucible libraries"
-  if ! get -o /tmp/libraries.zip "$librariesUrl"; then
-    log "ERROR: failed to download Crucible libraries from $librariesUrl"
-    exit 1
-  fi
-
-  if ! unzip /tmp/libraries.zip -d "$librariesDir"; then
-    log "ERROR: failed to unzip Crucible libraries"
-    exit 1
-  fi
-  rm /tmp/libraries.zip
-fi
-
-export SERVER
-export SKIP_LOG4J_CONFIG=true
-
-exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"

start-configuration

@@ -103,14 +103,6 @@ case "${TYPE^^}" in
   ;;
 
   FORGE)
-    if versionLessThan 1.17; then
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
-    fi
     exec ${SCRIPTS:-/}start-deployForge "$@"
   ;;
 
@@ -123,10 +115,6 @@ case "${TYPE^^}" in
   ;;
 
   FTB|CURSEFORGE)
-    log "**********************************************************************"
-    log "NOTE: Some mods and modpacks may require Java 8."
-    log "      If so, use itzg/minecraft-server:java8"
-    log "**********************************************************************"
     exec ${SCRIPTS:-/}start-deployCF "$@"
   ;;
 
@@ -142,6 +130,10 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployCustom "$@"
   ;;
 
+  CURSE_INSTANCE)
+    exec ${SCRIPTS:-/}start-validateCurseInstance "$@"
+  ;;
+
   MAGMA)
     exec ${SCRIPTS:-/}start-deployMagma "$@"
   ;;
@@ -170,21 +162,11 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployLimbo "$@"
   ;;
 
-  CRUCIBLE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
-    exec "${SCRIPTS:-/}start-deployCrucible" "$@"
-  ;;
-
   *)
       log "Invalid type: '$TYPE'"
       log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
-      log "         CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM,"
-      log "         MAGMA, MOHIST, CATSERVER, AIRPLANE, CANYON, LIMBO, CRUCIBLE"
+      log "         CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, PURPUR, CUSTOM,"
+      log "         MAGMA, MOHIST, CATSERVER, AIRPLANE, CANYON, LIMBO"
       exit 1
   ;;
 

start-deployCF

@@ -2,8 +2,7 @@
 
 set -e
 
-# shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
+. ${SCRIPTS:-/}start-utils
 
 loadForgeVars() {
   cfgFile=${1?}
@@ -24,7 +23,7 @@ loadForgeVars() {
 
 isDebugging && set -x
 
-: "${FTB_BASE_DIR:=${CF_BASE_DIR:-/data/FeedTheBeast}}"
+: ${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
@@ -35,7 +34,7 @@ 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 ! isTrue ${USE_MODPACK_START_SCRIPT:-true}; then
   if ! [ -f "${FTB_SERVER_MOD}" ]; then
     log "ERROR unable to find requested modpack file ${FTB_SERVER_MOD}"
     exit 2
@@ -47,9 +46,9 @@ if ! isTrue "${USE_MODPACK_START_SCRIPT:-true}"; then
     if [ "$(cat $installMarker)" != "${FTB_SERVER_MOD}" ]; then
       log "Upgrading modpack"
 
-      serverJar=$(find "${FTB_BASE_DIR}" -not -name "forge*installer.jar" -name "forge*.jar")
+      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}
+        rm -rf $(dirname "${serverJar}")/{mods,*.jar,libraries,resources,scripts,config}
       fi
     else
       needsInstall=false
@@ -58,10 +57,10 @@ if ! isTrue "${USE_MODPACK_START_SCRIPT:-true}"; then
 
   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 ""}'
+    mkdir -p ${FTB_BASE_DIR}
+    unzip -o "${FTB_SERVER_MOD}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
 
-    serverJar=$(find "${FTB_BASE_DIR}" -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
+    serverJar=$(find ${FTB_BASE_DIR} -type f \( -path "*/libraries/*" -o -path "*/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
     if [[ -z "$serverJar" ]]; then
 
       if [ -f "${FTB_BASE_DIR}/settings.cfg" ]; then
@@ -87,24 +86,22 @@ if ! isTrue "${USE_MODPACK_START_SCRIPT:-true}"; then
 
       log "Installing forge server"
       dirOfInstaller=$(dirname "${forgeInstallerJar}")
-      (cd "${dirOfInstaller}"; java -jar "$(basename "${forgeInstallerJar}")" --installServer)
+      (cd "${dirOfInstaller}"; java -jar $(basename "${forgeInstallerJar}") --installServer)
     fi
 
     echo "${FTB_SERVER_MOD}" > $installMarker
   fi
 
-  SERVER=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
+  export SERVER=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
   if [[ -z "${SERVER}" || ! -f "${SERVER}" ]]; then
     log "ERROR unable to locate installed forge server jar"
-    isDebugging && find "${FTB_BASE_DIR}" -name "forge*.jar"
+    isDebugging && find ${FTB_BASE_DIR} -name "forge*.jar"
     exit 2
   fi
-  export SERVER
 
-  FTB_DIR=$(dirname "${SERVER}")
-  export FTB_DIR
+  export FTB_DIR=$(dirname "${SERVER}")
 
-  exec "${SCRIPTS:-/}start-setupWorld" "$@"
+  exec ${SCRIPTS:-/}start-setupWorld $@
 fi
 
 entryScriptExpr="
@@ -119,8 +116,8 @@ entryScriptExpr="
   "
 
 if [[ -d ${FTB_BASE_DIR} ]]; then
-  startScriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr |wc -l)
-  if (( startScriptCount > 1 )); then
+  startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |wc -l)
+  if [[ $startScriptCount > 1 ]]; then
     log "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
     exit 2
   fi
@@ -134,11 +131,22 @@ fi
 if [[ $startScriptCount = 0 ]]; then
   srv_modpack=${FTB_SERVER_MOD}
   if isURL "${srv_modpack}"; then
-    log "Downloading modpack from ${srv_modpack}..."
-    if ! srv_modpack=$(get -o /data --output-filename --skip-existing "${srv_modpack}"); then
-      log "ERROR: failed to download modpack"
-      exit 1
-    fi
+      case $srv_modpack in
+        https://www.feed-the-beast.com/*/download|https://www.curseforge.com/minecraft/modpacks/*/download/*/file)
+          ;;
+        https://www.curseforge.com/minecraft/modpacks/*/download/*)
+          srv_modpack=${srv_modpack}/file;;
+        https://www.feed-the-beast.com/*)
+          srv_modpack=${srv_modpack}/download;;
+      esac
+      file=$(basename $(dirname $srv_modpack))
+      downloaded=/data/${file}.zip
+      if [ ! -e $downloaded ]; then
+        log "Downloading FTB modpack...
+  $srv_modpack -> $downloaded"
+        curl -sSL -o $downloaded $srv_modpack
+      fi
+      srv_modpack=$downloaded
   fi
   if [[ "${srv_modpack:0:5}" == "data/" ]]; then
       # Prepend with "/"
@@ -159,8 +167,8 @@ if [[ $startScriptCount = 0 ]]; then
   fi
 
   log "Unpacking FTB server modpack ${srv_modpack} ..."
-  mkdir -p "${FTB_BASE_DIR}"
-  unzip -o "${srv_modpack}" -d "${FTB_BASE_DIR}" | awk '{printf "."} END {print ""}'
+  mkdir -p ${FTB_BASE_DIR}
+  unzip -o "${srv_modpack}" -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
 
   installScript=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f -name install.sh)
   if [[ "$installScript" ]]; then
@@ -173,14 +181,13 @@ if [[ $startScriptCount = 0 ]]; then
   fi
 fi
 
-if [[ $(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l) = 0 ]]; then
+if [[ $(find ${FTB_BASE_DIR} $entryScriptExpr | wc -l) = 0 ]]; then
 
     # Allow up to 2 levels since some modpacks have a top-level directory named
     # for the modpack
-    forgeJar=$(find "${FTB_BASE_DIR}" -maxdepth 2 -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -print)
+    forgeJar=$(find ${FTB_BASE_DIR} -type f \( -path "/libraries/*" -o -path "/mods/*" \) -prune -o -name "forge*.jar" -not -name "forge*installer.jar" -maxdepth 2 -print)
     if [[ "$forgeJar" ]]; then
-      FTB_BASE_DIR=$(dirname "${forgeJar}")
-      export FTB_BASE_DIR
+      export FTB_BASE_DIR=$(dirname "${forgeJar}")
       log "No entry script found, so building one for ${forgeJar}"
       cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
 #!/bin/sh
@@ -198,29 +205,25 @@ scriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l)
 if [[ $scriptCount = 0 ]]; then
     log "Please make sure you are using the server version of the FTB modpack!"
     exit 2
-elif (( scriptCount > 1 )); then
-    log "Ambiguous startup scripts in FTB modpack! Found:"
-    find "${FTB_BASE_DIR}" $entryScriptExpr
+elif [[ $scriptCount > 1 ]]; then
+    log "Ambigous startup scripts in FTB modpack!"
+    log "found:"
+    find ${FTB_BASE_DIR} $entryScriptExpr
     exit 2
 fi
 
-FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
-export FTB_SERVER_START
+export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
 
-FTB_DIR=$(dirname "${FTB_SERVER_START}")
-export FTB_DIR
+export FTB_DIR=$(dirname "${FTB_SERVER_START}")
 chmod a+x "${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
+if isTrue ${FTB_LEGACYJAVAFIXER} && [ ! -e "${legacyJavaFixerPath}" ]; then
   log "Installing legacy java fixer to ${legacyJavaFixerPath}"
-  if ! get -o "${legacyJavaFixerPath}" ${legacyJavaFixerUrl}; then
-    log "ERROR failed to download legacy java fixer from ${legacyJavaFixerUrl}"
-    exit 1
-  fi
+  curl -sSL -o "${legacyJavaFixerPath}" ${legacyJavaFixerUrl}
 fi
 
 if [ -e "${FTB_DIR}/FTBInstall.sh" ]; then
@@ -233,4 +236,4 @@ elif [ -e "${FTB_DIR}/Install.sh" ]; then
   popd
 fi
 
-exec "${SCRIPTS:-/}start-setupWorld" "$@"
+exec ${SCRIPTS:-/}start-setupWorld $@

start-deployFTBA

@@ -16,7 +16,7 @@ if ! [[ ${FTB_MODPACK_ID} =~ [0-9]+ ]]; then
   exit 1
 fi
 
-if [[ ! $FTB_MODPACK_VERSION_ID ]]; then
+if ! [[ -v FTB_MODPACK_VERSION_ID ]]; then
   if ! FTB_MODPACK_VERSION_ID=$(curl -fsSL https://api.modpacks.ch/public/modpack/${FTB_MODPACK_ID} | jq -r '.versions | sort_by(.updated)[-1].id'); then
     log "ERROR unable to resolve latest modpack version ID for modpack ${FTB_MODPACK_ID}"
     exit 1

start-deployFabric

@@ -14,7 +14,6 @@ if [[ ! -e ${SERVER} ]]; then
 
   : ${FABRIC_INSTALLER:=}
   : ${FABRIC_INSTALLER_URL:=}
-  : ${FABRIC_LOADER_VERSION:=LATEST}
   : ${FABRIC_INSTALLER_VERSION:=${FABRICVERSION:-LATEST}}
 
   if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
@@ -32,12 +31,6 @@ if [[ ! -e ${SERVER} ]]; then
     exit 2
   fi
 
-  if [[ -z $FABRIC_LOADER_VERSION || ${FABRIC_LOADER_VERSION^^} = LATEST ]]; then
-    log "Checking Fabric Loader version information."
-
-    FABRIC_LOADER_VERSION=$(maven-metadata-release https://maven.fabricmc.net/net/fabricmc/fabric-loader/maven-metadata.xml)
-  fi
-
   if [[ ! -e $FABRIC_INSTALLER ]]; then
     log "Downloading $FABRIC_INSTALLER_URL ..."
     if ! get -o "$FABRIC_INSTALLER" "$FABRIC_INSTALLER_URL"; then
@@ -46,14 +39,13 @@ if [[ ! -e ${SERVER} ]]; then
     fi
   fi
 
-  log "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER with loader version $FABRIC_LOADER_VERSION"
+  log "Installing Fabric ${VANILLA_VERSION} using $FABRIC_INSTALLER"
 
   tries=3
   set +e
   while ((--tries >= 0)); do
     java -jar $FABRIC_INSTALLER server \
       -mcversion $VANILLA_VERSION \
-      -loader $FABRIC_LOADER_VERSION \
       -downloadMinecraft \
       -dir /data
     if [[ $? == 0 ]]; then

start-deployForge

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-: "${FORGEVERSION:=RECOMMENDED}"
-
-# shellcheck source=start-utils
-. "${SCRIPTS:-$(dirname "$0")}/start-utils"
+. ${SCRIPTS:-/}start-utils
+: ${FORGEVERSION:=RECOMMENDED}
 isDebugging && set -x
 
 get_installer() {
@@ -18,7 +16,7 @@ get_installer() {
     for fn in $forgeFileNames; do
       downloadUrl=https://maven.minecraftforge.net/net/minecraftforge/forge/$fn
       log "...trying $downloadUrl"
-      if get -o "$FORGE_INSTALLER" "$downloadUrl"; then
+      if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
         return
       fi
     done
@@ -26,7 +24,7 @@ get_installer() {
     exit 2
  else
     log "Downloading $FORGE_INSTALLER_URL ..."
-    if ! get -o "$FORGE_INSTALLER" "$FORGE_INSTALLER_URL"; then
+    if ! curl -o $FORGE_INSTALLER -fsSL $FORGE_INSTALLER_URL; then
       log "Failed to download from given location $FORGE_INSTALLER_URL"
       exit 2
     fi
@@ -34,38 +32,33 @@ get_installer() {
 }
 
 install() {
-  if [ ! -e "$FORGE_INSTALLER" ]; then
-    get_installer "$normForgeVersion" "$shortForgeVersion"
+  if [ ! -e $FORGE_INSTALLER ]; then
+    get_installer $normForgeVersion $shortForgeVersion
   fi
 
   log "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
   mkdir -p mods
   tries=3
   while ((--tries >= 0)); do
-    if java -jar "$FORGE_INSTALLER" --installServer; then
+    java -jar $FORGE_INSTALLER --installServer
+    if [ $? == 0 ]; then
       break
     fi
   done
-  if ((tries < 0)); then
+  if (($tries < 0)); then
     log "Forge failed to install after several tries." >&2
     exit 10
   fi
   # NOTE $shortForgeVersion will be empty if installer location was given to us
   log "Finding installed server jar..."
   unset -v latest
-  # 1.17+ ?
-  if [ -f /data/run.sh ]; then
-    latest=/data/run.sh
-  # else pre 1.17
-  else
-    for file in *forge*.jar; do
-      if ! [[ $file =~ installer ]]; then
-        if [[ -z $latest ]] || [[ $file -nt $latest ]]; then
-          latest=$file
-        fi
+  for file in *forge*.jar; do
+    if ! [[ $file =~ installer ]]; then
+      if [[ -z $latest ]] || [[ $file -nt $latest ]]; then
+        latest=$file
       fi
-    done
-  fi
+    fi
+  done
   if [[ -z $latest ]]; then
     log "Unable to derive server jar for Forge"
     exit 2
@@ -73,8 +66,7 @@ install() {
 
   export SERVER=$latest
   log "Using server $SERVER"
-  debug "Writing install marker at $installMarker"
-  echo "$SERVER" > "$installMarker"
+  echo $SERVER > $installMarker
 }
 
 resolve_versions() {
@@ -89,21 +81,15 @@ resolve_versions() {
     esac
 
     #################################################################################
-    promosUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
 
     log "Checking Forge version information."
     case $FORGEVERSION in
-      LATEST)
-        if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-latest']" "$promosUrl"); then
-          log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
-          log "       Refer to http://files.minecraftforge.net/ for supported versions"
-          exit 2
-        fi
-        ;;
-
       RECOMMENDED)
-        if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-recommended']" "$promosUrl"); then
-          if ! FORGE_VERSION=$(get --json-path ".promos['$VANILLA_VERSION-latest']" "$promosUrl"); then
+        curl -fsSL -o /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
+        FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-recommended\"]")
+        if [ $FORGE_VERSION = null ]; then
+          FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
+          if [ $FORGE_VERSION = null ]; then
             log "ERROR: Version $VANILLA_VERSION is not supported by Forge"
             log "       Refer to http://files.minecraftforge.net/ for supported versions"
             exit 2
@@ -136,15 +122,14 @@ resolve_versions
 
 installMarker="/data/.forge-installed-$shortForgeVersion"
 
-if [ ! -e "$installMarker" ] || isTrue "${FORCE_REINSTALL:-false}"; then
+if [ ! -e $installMarker ]; then
   install
 else
-  SERVER=$(cat "$installMarker")
-  export SERVER
-  if [ ! -e "$SERVER" ]; then
+  export SERVER=$(cat $installMarker)
+  if [ ! -e "$SERVER" ] && versionLessThan 1.17; then
     rm "$installMarker"
     install
   fi
 fi
 
-exec "${SCRIPTS:-/}start-setupWorld" "$@"
+exec ${SCRIPTS:-/}start-setupWorld $@

start-deployMohist

@@ -1,18 +1,17 @@
 #!/bin/bash
 
-# shellcheck source=start-utils
-. "${SCRIPTS:-$(dirname "$0")}/start-utils"
+. ${SCRIPTS:-/}start-utils
 set -o pipefail
 set -e
 isDebugging && set -x
 
 requireVar VANILLA_VERSION
-: "${MOHIST_BUILD:=lastSuccessfulBuild}"
+: ${MOHIST_BUILD:=lastSuccessfulBuild}
 
 mohistJobs=https://ci.codemc.io/job/MohistMC/job/
 mohistJob=${mohistJobs}Mohist-${VANILLA_VERSION}/
 
-if ! get --exists "${mohistJob}"; then
+if ! curl -X HEAD -o /dev/null -fsSL "${mohistJob}"; then
   log "ERROR: mohist builds do not exist for ${VANILLA_VERSION}"
   log "       check https://ci.codemc.io/job/MohistMC/ for available versions"
   log "       and set VERSION accordingly"
@@ -20,7 +19,8 @@ if ! get --exists "${mohistJob}"; then
 fi
 
 buildRelPath=$(
-  get --json-path '$.artifacts[0].relativePath' "${mohistJob}${MOHIST_BUILD}/api/json"
+  curl -fsSL "${mohistJob}${MOHIST_BUILD}/api/json" |
+    jq -r '.artifacts[0].relativePath'
 )
 
 baseName=$(basename "${buildRelPath}")
@@ -33,11 +33,11 @@ fi
 
 export SERVER="/data/${baseName}"
 
-if [ ! -f "${SERVER}" ]; then
+if [ ! -f ${SERVER} ]; then
   log "Downloading ${baseName}"
-  get -o "${SERVER}" "${mohistJob}${MOHIST_BUILD}/artifact/${buildRelPath}"
+  curl -o "${SERVER}" -fsSL "${mohistJob}${MOHIST_BUILD}/artifact/${buildRelPath}"
 fi
 
 export SKIP_LOG4J_CONFIG=true
 
-exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"
+exec ${SCRIPTS:-/}start-setupWorld "$@"

start-finalExec

@@ -70,8 +70,8 @@ if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
   EXTRA_ARGS+=" nogui"
 fi
 
-: "${INIT_MEMORY:=${MEMORY}}"
-: "${MAX_MEMORY:=${MEMORY}}"
+# put these prior JVM_OPTS at the end to give any memory settings there higher precedence
+log "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}"
 
 expandedDOpts=
 if [ -n "$JVM_DD_OPTS" ]; then
@@ -157,15 +157,7 @@ if isTrue "${DEBUG_MEMORY}"; then
   free -m
 fi
 
-if [[ ${INIT_MEMORY} || ${MAX_MEMORY} ]]; then
-  log "Setting initial memory to ${INIT_MEMORY:=${MEMORY}} and max to ${MAX_MEMORY:=${MEMORY}}"
-  if [[ ${INIT_MEMORY} ]]; then
-    JVM_OPTS="-Xms${INIT_MEMORY} ${JVM_OPTS}"
-  fi
-  if [[ ${MAX_MEMORY} ]]; then
-    JVM_OPTS="-Xmx${MAX_MEMORY} ${JVM_OPTS}"
-  fi
-fi
+JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
 
 function copyFilesForCurseForge() {
   # copy player modification files unconditionally since their
@@ -188,7 +180,14 @@ if [[ ${STOP_SERVER_ANNOUNCE_DELAY} ]]; then
   mcServerRunnerArgs+=(--stop-server-announce-delay "${STOP_SERVER_ANNOUNCE_DELAY}s")
 fi
 
-if [[ ${TYPE} == "CURSEFORGE" && "${SERVER}" ]]; then
+if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
+    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} == "CURSEFORGE" && "${SERVER}" ]]; then
   copyFilesForCurseForge
 
   cd "${FTB_DIR}" || (log "ERROR: can't go into ${FTB_DIR}"; exit 1)
@@ -205,11 +204,11 @@ elif [[ ${TYPE} == "CURSEFORGE" ]]; then
   cat > "${FTB_DIR}/settings-local.sh" <<EOF
 export MIN_RAM="${INIT_MEMORY}"
 export MAX_RAM="${MAX_MEMORY}"
-export JAVA_PARAMETERS="${JVM_XX_OPTS} ${JVM_OPTS} $expandedDOpts"
+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" ] && [[ ${MAX_MEMORY} ]]; then
+  if [ -f "${FTB_DIR}/settings.cfg" ]; then
     sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg"
   fi
 
@@ -218,7 +217,7 @@ EOF
 
   finalArgs="${FTB_SERVER_START}"
 
-  if isTrue "${SETUP_ONLY:=false}"; then
+  if isTrue ${SETUP_ONLY:=false}; then
     echo "SETUP_ONLY: ${finalArgs}"
     exit
   fi
@@ -256,11 +255,11 @@ else
     exit
   fi
 
-  if isTrue "${DEBUG_EXEC}"; then
+  if isTrue ${DEBUG_EXEC}; then
     set -x
   fi
 
-  if isTrue "${EXEC_DIRECTLY:-false}"; then
+  if isTrue ${EXEC_DIRECTLY:-false}; then
     exec java "${finalArgs[@]}"
   else
     exec mc-server-runner ${bootstrapArgs} "${mcServerRunnerArgs[@]}" java "${finalArgs[@]}"

start-setupModpack

@@ -2,20 +2,17 @@
 
 set -e -o pipefail
 
-: "${REMOVE_OLD_MODS:=false}"
-: "${MODS_FILE:=}"
-: "${REMOVE_OLD_MODS_DEPTH:=1} "
-: "${REMOVE_OLD_MODS_INCLUDE:=*.jar}"
-
 # shellcheck source=start-utils
-. "${SCRIPTS:-/}start-utils"
-isDebugging && set -x
+. ${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}" && [ -z "${MODS_FILE}" ]; then
+if isTrue ${REMOVE_OLD_MODS:-false}; then
   removeOldMods /data/mods
   removeOldMods /data/plugins
 fi
@@ -23,13 +20,25 @@ 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 %{url_effective} $MODPACK)
+      if ! [[ $downloadUrl == *.zip ]]; then
+        log "ERROR Invalid URL given for MODPACK: $downloadUrl resolved from $MODPACK"
+        log "      Must be HTTP, HTTPS or FTP and a ZIP file"
+        exit 1
+      fi
+    fi
+
     log "Downloading mod/plugin pack"
-    if ! get -o /tmp/modpack.zip "${MODPACK}"; then
-      log "ERROR: failed to download from ${MODPACK}"
+    log "  from $downloadUrl ..."
+    if ! curl -sSL -o /tmp/modpack.zip "$downloadUrl"; then
+      log "ERROR: failed to download from $downloadUrl"
       exit 2
     fi
   elif [[ "$MODPACK" =~ .*\.zip ]]; then
-    if ! cp "$MODPACK" /tmp/modpack.zip; then
+    if ! cp $MODPACK /tmp/modpack.zip; then
       log "ERROR: failed to copy from $MODPACK"
       exit 2
     fi
@@ -41,17 +50,19 @@ if [[ "$MODPACK" ]]; then
   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 ${MODPACK}"
+      log "ERROR: failed to unzip the modpack from $downloadUrl"
     fi
   else
     mkdir -p /data/mods
     if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-      log "ERROR: failed to unzip the modpack from ${MODPACK}"
+      log "ERROR: failed to unzip the modpack from $downloadUrl"
     fi
   fi
   rm -f /tmp/modpack.zip
+fi
 
-elif [[ "$MODS" ]]; then
+# If supplied with a URL for a plugin download it.
+if [[ "$MODS" ]]; then
   if [ "$TYPE" = "SPIGOT" ]; then
     out_dir=/data/plugins
   else
@@ -82,37 +93,6 @@ elif [[ "$MODS" ]]; then
       exit 2
     fi
   done
-
-elif [[ "$MODS_FILE" ]]; then
-  if [ ! -f "$MODS_FILE" ]; then
-    log "ERROR: given MODS_FILE file does not exist"
-    exit 2
-  fi
-
-  if [ "$TYPE" = "SPIGOT" ]; then
-    out_dir=/data/plugins
-  else
-    out_dir=/data/mods
-  fi
-  mkdir -p "$out_dir"
-
-  args=(
-    -o "${out_dir}"
-    --log-progress-each
-    --skip-existing
-    --uris-file "${MODS_FILE}"
-  )
-  if isTrue "${REMOVE_OLD_MODS}"; then
-    args+=(
-    --prune-others "${REMOVE_OLD_MODS_INCLUDE}"
-    --prune-depth "${REMOVE_OLD_MODS_DEPTH}"
-    )
-  fi
-
-  if ! get "${args[@]}" ; then
-    log "ERROR: failed to retrieve one or more mods"
-    exit 1
-  fi
 fi
 
 if [[ "$MANIFEST" ]]; then
@@ -149,7 +129,7 @@ case "X$EFFECTIVE_MANIFEST_FILE" in
         fi
       done
     else
-      log "Could not find manifest file, insufficient privileges, or malformed path."
+      log "Could not find manifest file, unsufficient privs, or malformed path."
     fi
     ;;
   *)
@@ -158,63 +138,41 @@ case "X$EFFECTIVE_MANIFEST_FILE" in
 esac
 fi
 
-: "${GENERIC_PACKS:=${GENERIC_PACK}}"
-
-if [[ "${GENERIC_PACKS}" ]]; then
-  IFS=',' read -ra packs <<< "${GENERIC_PACKS}"
-
-  packFiles=()
-  for pack in "${packs[@]}"; do
-    if isURL "$pack"; then
-      mkdir -p /data/packs
-      if ! outfile=$(get -o /data/packs --output-filename --skip-existing "$pack"); then
-        log "ERROR: failed to download $pack"
-        exit 2
-      fi
-      packFiles+=("$outfile")
-    else
-      packFiles+=("$pack")
+if [[ "${GENERIC_PACK}" ]]; then
+  if isURL "${GENERIC_PACK}"; then
+    log "Downloading generic pack ..."
+    if ! curl -fsSL -o /tmp/generic_pack.zip "${GENERIC_PACK}"; then
+      log "ERROR: failed to download ${GENERIC_PACK}"
+      exit 2
     fi
-  done
+    GENERIC_PACK=/tmp/generic_pack.zip
+  fi
 
   sum_file=/data/.generic_pack.sum
-  isDebugging && [ -f "$sum_file}" ] && cat "$sum_file"
-  if ! sha256sum -c "${sum_file}" --status 2> /dev/null; then
+  if ! sha256sum -c ${sum_file} -s 2> /dev/null; then
     base_dir=/tmp/generic_pack_base
     mkdir -p ${base_dir}
-    for pack in "${packFiles[@]}"; do
-      isDebugging && ls -l "${pack}"
-      unzip -q -d ${base_dir} "${pack}"
-    done
-
-    # recalculate the actual base directory of content
-    base_dir=$(find "$base_dir" -type d \( -name mods -o -name plugins -o -name config \) -printf '%h' -quit)
-    if [[ ! $base_dir ]]; then
-      log "ERROR: Unable to find content base of generic packs ${GENERIC_PACKS}. Directories:"
-      find /tmp/generic_pack_base -type d -printf '  - %P\n'
-      exit 1
-    fi
-
+    isDebugging && ls -l "${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 -r f; do
+      while read f; do
         rm -rf "/data/${f}"
       done < /data/manifest.txt
-      # prune empty dirs
-      find /data -mindepth 1 -depth -type d -empty -delete
+      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 -printf "%P\n" > /data/manifest.txt
-
+    find ${base_dir} -type f -print0 | xargs -0 -I {} echo "{}" | sed "s#${base_dir}/##" > /data/manifest.txt
     log "Applying generic pack ..."
-    cp -R -f "${base_dir}"/* /data
-    rm -rf /tmp/generic_pack_base
-
-    sha256sum "${packFiles[@]}" > "${sum_file}"
-    isDebugging && cat "$sum_file"
+    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
 fi
 
-exec "${SCRIPTS:-/}start-setupModconfig" "$@"
+exec ${SCRIPTS:-/}start-setupModconfig $@

start-setupServerProperties

@@ -187,25 +187,21 @@ if [[ ${TYPE} == "CURSEFORGE" ]]; then
   log "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
 fi
 
-if ! isTrue "${SKIP_SERVER_PROPERTIES:-false}"; then
-  if [ ! -e "$SERVER_PROPERTIES" ]; then
-    log "Creating server.properties in ${SERVER_PROPERTIES}"
-    cp /tmp/server.properties "$SERVER_PROPERTIES"
-    customizeServerProps
-  elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
-      case ${OVERRIDE_SERVER_PROPERTIES^^} in
-        TRUE|1)
-          customizeServerProps
-          ;;
-        *)
-          log "server.properties already created, skipping"
-          ;;
-      esac
-  else
-    log "server.properties already created, skipping"
-  fi
+if [ ! -e "$SERVER_PROPERTIES" ]; then
+  log "Creating server.properties in ${SERVER_PROPERTIES}"
+  cp /tmp/server.properties "$SERVER_PROPERTIES"
+  customizeServerProps
+elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
+    case ${OVERRIDE_SERVER_PROPERTIES^^} in
+      TRUE|1)
+        customizeServerProps
+        ;;
+      *)
+        log "server.properties already created, skipping"
+        ;;
+    esac
 else
-  log "Skipping setup of server.properties"
+  log "server.properties already created, skipping"
 fi
 
 if isTrue "${ENABLE_AUTOPAUSE}"; then

start-validateCurseInstance

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. ${SCRIPTS:-/}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}"
+
+exec ${SCRIPTS:-/}start-setupWorld "$@"

tests/generic-packs/docker-compose.test.yml

@@ -1,15 +0,0 @@
-version: "3"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-      GENERIC_PACKS: https://github.com/itzg/mc-image-helper/releases/download/v1.9.5/mc-image-helper-1.9.5.zip,/packs/testing.zip
-      DEBUG: "true"
-    volumes:
-      - ./packs:/packs
-      - data:/data
-
-volumes:
-  data: {}