Generalize EULA instructions in error

.github/workflows/build-multiarch.yml

@@ -20,8 +20,8 @@ jobs:
       matrix:
         # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config
         variant:
-          - java24
+          - java23
-          - java24-graalvm
+          - java23-graalvm
           - java21
           - java21-alpine
           - java21-graalvm
@@ -33,14 +33,15 @@ jobs:
           - java8-graalvm-ce
           - java8-openj9
           - java8-jdk
+          - java11
         include:
-        # JAVA 24
+        # JAVA 23
-          - variant: java24
+          - variant: java23
-            baseImage: eclipse-temurin:24-jre
+            baseImage: eclipse-temurin:23-jre
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
-          - variant: java24-graalvm
+          - variant: java23-graalvm
-            baseImage: container-registry.oracle.com/graalvm/jdk:24-ol8
+            baseImage: container-registry.oracle.com/graalvm/jdk:23-ol8
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
         # JAVA 21:
@@ -74,6 +75,11 @@ jobs:
             baseImage: eclipse-temurin:17-jre-alpine
             platforms: linux/amd64
             mcVersion: 1.20.4
+        # JAVA 11:
+          - variant: java11
+            baseImage: adoptopenjdk:11-jre-hotspot
+            platforms: linux/amd64,linux/arm/v7,linux/arm64
+            mcVersion: 1.16.5
         # JAVA 8: NOTE: Unable to go past 8u312 because of Forge dependencies
           - variant: java8
             baseImage: eclipse-temurin:8u312-b07-jre-focal
@@ -139,7 +145,7 @@ jobs:
         uses: docker/setup-qemu-action@v3.6.0
 
       - name: Build for test
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.15.0
         with:
           platforms: linux/amd64
           tags: ${{ env.IMAGE_TO_TEST }}
@@ -177,7 +183,7 @@ jobs:
           password: ${{ github.token }}
 
       - name: Build and push
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.15.0
         if: github.actor == github.repository_owner
         with:
           platforms: ${{ matrix.platforms }}
@@ -201,8 +207,5 @@ jobs:
           build-args: |
             BASE_IMAGE=${{ matrix.baseImage }}
             BUILD_FILES_REV=${{ steps.build-files-rev.outputs.REV }}
-            BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
           cache-from: type=gha,scope=${{ matrix.variant }}
           cache-to: type=gha,mode=max,scope=${{ matrix.variant }}

.github/workflows/verify-pr.yml

@@ -56,7 +56,7 @@ jobs:
         uses: docker/setup-buildx-action@v3.10.0
 
       - name: Confirm multi-arch build
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.15.0
         with:
           platforms: ${{ matrix.platforms }}
           # ensure latest base image is used
@@ -66,7 +66,7 @@ jobs:
           cache-from: type=gha,scope=${{ matrix.variant }}
 
       - name: Build for test
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.15.0
         with:
           # Only build single platform since loading multi-arch image into daemon fails with
           # "docker exporter does not currently support exporting manifest lists"

Dockerfile

@@ -26,11 +26,11 @@ EXPOSE 25565
 ARG APPS_REV=1
 ARG GITHUB_BASEURL=https://github.com
 
-ARG EASY_ADD_VERSION=0.8.10
+ARG EASY_ADD_VERSION=0.8.9
 ADD ${GITHUB_BASEURL}/itzg/easy-add/releases/download/${EASY_ADD_VERSION}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
 RUN chmod +x /usr/bin/easy-add
 
-ARG RESTIFY_VERSION=1.7.9
+ARG RESTIFY_VERSION=1.7.7
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${RESTIFY_VERSION} --var app=restify --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
@@ -40,7 +40,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${RCON_CLI_VERSION} --var app=rcon-cli --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_MONITOR_VERSION=0.15.5
+ARG MC_MONITOR_VERSION=0.15.3
 RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_MONITOR_VERSION} --var app=mc-monitor --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
@@ -50,7 +50,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
   --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.41.9
+ARG MC_HELPER_VERSION=1.41.2
 ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 # used for cache busting local copy of mc-image-helper
 ARG MC_HELPER_REV=1
@@ -78,8 +78,3 @@ RUN dos2unix /start* /auto/*
 
 ENTRYPOINT [ "/start" ]
 HEALTHCHECK --start-period=2m --retries=2 --interval=30s CMD mc-health
-
-ARG BUILDTIME=local
-ARG VERSION=local
-ARG REVISION=local
-RUN echo "buildtime=${BUILDTIME}\nversion=${VERSION}\nrevision=${REVISION}" > /etc/image.properties

docs/configuration/jvm-options.md

@@ -46,9 +46,8 @@ To let the JVM calculate the heap size from the container declared memory limit,
           MEMORY: ""
           JVM_XX_OPTS: "-XX:MaxRAMPercentage=75"
         deploy:
-          resources:
+          limits:
-            limits:
+            memory: 4G  
-              memory: 4G  
     ```
 
 !!! important

docs/misc/troubleshooting.md

@@ -5,34 +5,3 @@ To troubleshoot just the command-line used to start the Minecraft server, set th
 To troubleshoot any issues with memory allocation reported by the JVM, set the environment variable `DEBUG_MEMORY` to `true`.
 
 If you are experiencing any issues with the "Changing ownership of /data" step, that can be disabled by setting `SKIP_CHOWN_DATA` to `true`.
-
-To confirm the image version that has been pulled, use the following command, replacing `itzg/minecraft-server` as needed for specific image tags:
-
-## Image labels
-
-```shell
-docker image inspect itzg/minecraft-server -f "{{json .Config.Labels}}"
-```
-
-such as
-
-```json
-{
-  "org.opencontainers.image.authors": "... <...@gmail.com>",
-  "org.opencontainers.image.created": "2025-04-03T02:15:51.405Z",
-  "org.opencontainers.image.description": "Docker image that provides a Minecraft Server for Java Edition that automatically downloads selected version at startup",
-  "org.opencontainers.image.licenses": "Apache-2.0",
-  "org.opencontainers.image.ref.name": "ubuntu",
-  "org.opencontainers.image.revision": "d6897a649ecbc16b5fb2e1500e24b64ef80270a0",
-  "org.opencontainers.image.source": "https://github.com/itzg/docker-minecraft-server",
-  "org.opencontainers.image.title": "docker-minecraft-server",
-  "org.opencontainers.image.url": "https://github.com/itzg/docker-minecraft-server",
-  "org.opencontainers.image.version": "java21"
-}
-```
-
-The labels that are most interesting are:
-
-- `org.opencontainers.image.created` : the date/time the image was built
-- `org.opencontainers.image.revision` : which maps to <https://github.com/itzg/docker-minecraft-server/commit/REVISION>
-- `org.opencontainers.image.version` : image tag and variant [as described in this page](../versions/java.md)

docs/mods-and-plugins/index.md

@@ -16,9 +16,7 @@ On the left, there are sections describing some download automation options.
 
 ## Mods vs Plugins
 
-The terms "mods" and "plugins" can be quite confusing. Generally, the rule of thumb is that "mods" are used by the types that run client side to modify rendering, add new blocks, and add behaviors server, such as [Forge](../types-and-platforms/server-types/forge.md) and [Fabric](../types-and-platforms/server-types/fabric.md). "Plugins" are used by the types that **only run on servers** to add behaviors, commands, etc such as [Paper](../types-and-platforms/server-types/paper.md) (which derives from [Bukkit/Spigot](../types-and-platforms/server-types/bukkit-spigot.md)). There are also some types that are [hybrids](../types-and-platforms/server-types/hybrids.md), such as Magma, that use both "mods" and "plugins".
+The terms "mods" and "plugins" can be quite confusing. Generally, the rule of thumb is that "mods" are used by the types that run client side to modify rendering, add new blocks, and add behaviors server, such as [Forge](../types-and-platforms/server-types/forge.md) and [Fabric](../types-and-platforms/server-types/fabric.md). "Plugins" are used by the types that **only run on servers** to add behaviors, commands, etc such as [Paper](../types-and-platforms/server-types/paper.md) (which derives from [Bukkit/Spigot](../types-and-platforms/server-types/bukkit-spigot.md)). There are also some types that are [hybrids](../types-and-platforms/server-types/hybrids.md), such as Magma, that use both "mods" and "plugins"
-
-Typically, mods needs to be installed in both the client and server; however, there are some cases when only the server needs a mod. Plugins only need to be installed in the server and are never needed in the client.
 
 ## Optional plugins, mods, and config attach points
 
@@ -43,28 +41,8 @@ For example: `-e REMOVE_OLD_MODS=TRUE -e REMOVE_OLD_MODS_INCLUDE="*.jar" -e REMO
 
 These paths work well if you want to have a common set of modules in a separate location, but still have multiple worlds with different server requirements in either persistent volumes or a downloadable archive.
 
-!!! information "Multiple source directories"
+!!! information ""
-
+    For more flexibility with mods/plugins preparation, you can declare other directories, files, and URLs to use in [the `MODS` / `PLUGINS` variables](#modsplugins-list).
-    `COPY_PLUGINS_SRC`, `COPY_MODS_SRC`, `COPY_CONFIG_SRC` can each be set to a comma or newline delimited list of container directories to reference.
-
-    For example, in a compose file:
-    
-    ```yaml
-        environment:
-          # ...EULA, etc
-          TYPE: PAPER
-          # matches up to volumes declared below
-          COPY_PLUGINS_SRC: /plugins-common,/plugins-local
-        volumes:
-          - mc-data:/data
-          # For example, reference a shared directory used by several projects
-          - ../plugins-common:/plugins-common:ro
-          # and add plugins unique to this project
-          - ./plugins:/plugins-local:ro
-    ```
-
-    Alternatively, you can declare other directories along with files and URLs to use in [the `MODS` / `PLUGINS` variables](#modsplugins-list).
-
 
 
 ## Zip file modpack

docs/mods-and-plugins/modrinth.md

@@ -13,14 +13,14 @@
   
   To select a datapack from a Modrinth project, prefix the entry with "datapack:". When running a vanilla server, this is optional since only datapacks will be available for vanilla servers to select.
         
-  | Description                     | Example projects entry                                |
+  | Description                     | Example projects entry     |
-  |---------------------------------|-------------------------------------------------------|
+  |---------------------------------|----------------------------|
-  | Select latest version           | `fabric-api`                                          |
+  | Select latest version           | `fabric-api`               |
-  | Select specific version         | `fabric-api:bQZpGIz0`<br/>`fabric-api:0.119.2+1.21.4` |
+  | Select specific version         | `fabric-api:PbVeub96`      |
-  | Select latest beta version      | `fabric-api:beta`                                     |
+  | Select latest beta version      | `fabric-api:beta`          |
-  | Latest version using project ID | `P7dR8mSH`                                            |
+  | Latest version using project ID | `P7dR8mSH`                 |
-  | Latest version of datapack      | `datapack:terralith`                                  |
+  | Latest version of datapack      | `datapack:terralith`       |
-  | Specific version of datapack    | `datapack:terralith:2.5.5`                            |
+  | Specific version of datapack    | `datapack:terralith:2.5.5` |
 
 ## Extra options
 

docs/requirements.txt

@@ -1,7 +1,7 @@
-mkdocs-material == 9.6.12
+mkdocs-material == 9.6.8
 mkdocs-autorefs == 1.4.1
-mkdocstrings[python] == 0.29.1
+mkdocstrings[python] == 0.29.0
-mkdocs-literate-nav == 0.6.2
+mkdocs-literate-nav == 0.6.1
 mdx-gh-links == 0.4
-mkdocs-click == 0.9.0
+mkdocs-click == 0.8.1
 mkdocs-static-i18n == 1.3.0

docs/types-and-platforms/server-types/fabric.md

@@ -1,57 +1,23 @@
-A [Fabric server](https://fabricmc.net/) can be automatically downloaded, upgraded, and run by setting the environment variable TYPE to "FABRIC"
+Enable [Fabric server](https://fabricmc.net/) mode by adding a `-e TYPE=FABRIC` to your command-line.
 
-!!! example
+```
-
+docker run -d -v /path/on/host:/data \
-    Using `docker run` command line
+    -e TYPE=FABRIC \
-
+    -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
-    ```
+```
-    docker run -d -e EULA=TRUE -e TYPE=FABRIC -p 25565:25565 itzg/minecraft-server
-    ```
-    
-    In a compose file service:
-    
-    ```yaml
-    environment:
-      EULA: TRUE
-      TYPE: FABRIC
-    ```
 
 By default, the container will install the latest [fabric server launcher](https://fabricmc.net/use/server/), using the latest [fabric-loader](https://fabricmc.net/wiki/documentation:fabric_loader) against the minecraft version you have defined with `VERSION` (defaulting to the latest vanilla release of the game).
 
 A specific loader or launcher version other than the latest can be requested using `FABRIC_LOADER_VERSION` and `FABRIC_LAUNCHER_VERSION` respectively, such as:
 
-!!! example "Using launcher and loader versions"
+```
+docker run -d -v /path/on/host:/data ... \
+    -e TYPE=FABRIC \
+    -e FABRIC_LAUNCHER_VERSION=0.10.2 \
+    -e FABRIC_LOADER_VERSION=0.13.1
+```
 
-    With docker run
+!!! note
-
-    ```
-    docker run -d ... \
-        -e TYPE=FABRIC \
-        -e FABRIC_LAUNCHER_VERSION=0.10.2 \
-        -e FABRIC_LOADER_VERSION=0.13.1
-    ```
-    
-    In a compose file service:
-    
-    ```yaml
-    environment:
-      EULA: TRUE
-      TYPE: FABRIC
-      FABRIC_LAUNCHER_VERSION: 0.10.2
-      FABRIC_LOADER_VERSION: 0.13.1
-    ```
-
-!!! note "Fabric API"
-
-    As [mentioned on the Fabric download page](https://fabricmc.net/use/installer/), most mods will require the Fabric API mod to be installed. That can be easily done by utilizing [the Modrinth downloads feature](../../mods-and-plugins/modrinth.md), such as adding this to the `environment` of a compose file service:
-    
-    ```yaml
-          TYPE: FABRIC
-          MODRINTH_PROJECTS: |
-            fabric-api
-    ```
-
-!!! note "Alternate launcher"
 
     If you wish to use an alternative launcher you can:  
 

docs/versions/java.md

@@ -10,29 +10,26 @@ or explicitly include the tag, such as
 
 where `<tag>` refers to the first column of this table:
 
-| Tag              | Java version | Linux  | JVM Type           | Architecture        | Note |
+| Tag              | Java version | Linux  | JVM Type           | Architecture        |
-|------------------|--------------|--------|--------------------|---------------------|------|
+|------------------|--------------|--------|--------------------|---------------------|
-| latest           | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
+| latest           | 21           | Ubuntu | Hotspot            | amd64, arm64        |
-| stable           | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
+| stable           | 21           | Ubuntu | Hotspot            | amd64, arm64        |
-| java24           | 24           | Ubuntu | Hotspot            | amd64, arm64        | (2)  |
+| java23           | 23           | Ubuntu | Hotspot            | amd64, arm64        |
-| java24-graalvm   | 24           | Oracle | Oracle GraalVM (3) | amd64, arm64        | (2)  |   
+| java23-graalvm   | 23           | Oracle | Oracle GraalVM[^1] | amd64, arm64        |   
-| java21           | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
+| java21           | 21           | Ubuntu | Hotspot            | amd64, arm64        |
-| java21-jdk       | 21           | Ubuntu | Hotspot+JDK        | amd64, arm64        |      |
+| java21-jdk       | 21           | Ubuntu | Hotspot+JDK        | amd64, arm64        |
-| java21-alpine    | 21           | Alpine | Hotspot            | amd64, arm64        |      |
+| java21-alpine    | 21           | Alpine | Hotspot            | amd64, arm64        |
-| java21-graalvm   | 21           | Oracle | Oracle GraalVM (3) | amd64, arm64        |      |   
+| java21-graalvm   | 21           | Oracle | Oracle GraalVM[^1] | amd64, arm64        |   
-| java17           | 17           | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
+| java17           | 17           | Ubuntu | Hotspot            | amd64, arm64, armv7 |
-| java17-graalvm   | 17           | Oracle | Oracle GraalVM (3) | amd64, arm64        |      |   
+| java17-graalvm   | 17           | Oracle | Oracle GraalVM[^1] | amd64, arm64        |   
-| java17-alpine    | 17           | Alpine | Hotspot            | amd64  (1)          |      |
+| java17-alpine    | 17           | Alpine | Hotspot            | amd64  (1)          |
-| java8            | 8            | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
+| java11           | 11           | Ubuntu | Hotspot            | amd64, arm64, armv7 |
-| java8-jdk        | 8            | Ubuntu | Hotspot+JDK        | amd64               |      |
+| java8            | 8            | Ubuntu | Hotspot            | amd64, arm64, armv7 |
-| java8-openj9     | 8            | Debian | OpenJ9             | amd64               |      |
+| java8-jdk        | 8            | Ubuntu | Hotspot+JDK        | amd64               |
-| java8-graalvm-ce | 8            | Oracle | GraalVM CE         | amd64               |      |
+| java8-openj9     | 8            | Debian | OpenJ9             | amd64               |
-
+| java8-graalvm-ce | 8            | Oracle | GraalVM CE         | amd64               |
-Notes
 
 1. Why no arm64 for Java 17 Alpine? That is because the base images, such as [elipse-temurin](https://hub.docker.com/_/eclipse-temurin/tags?page=&page_size=&ordering=&name=17-jre-alpine) do not provide support for that. Use the Ubuntu based images instead.
-2. Short-term variant, subject to deprecation upon next version introduction
-3. Based on the [Oracle GraalMV images](https://blogs.oracle.com/java/post/new-oracle-graalvm-container-images), which as of JDK 17, are now under the [GraalVM Free License](https://blogs.oracle.com/java/post/graalvm-free-license) incorporating what used to be known as the GraalVM Enterprise.
 
 !!! example "Example using java8"
 
@@ -126,17 +123,17 @@ Forge also doesn't support openj9 JVM implementation.
 
 The following image tags have been deprecated and are no longer receiving updates:
 
+- java19
 - adopt13
 - adopt14
 - adopt15
 - openj9-nightly
 - multiarch-latest
-- java11
 - java16/java16-openj9
 - java17-graalvm-ce
 - java17-openj9
-- java19
 - java20-graalvm, java20, java20-alpine
-- java23-*
 - java8-multiarch is still built and pushed, but please move to java8 instead
 - java8-alpine
+
+[^1]: Based on the [Oracle GraalMV images](https://blogs.oracle.com/java/post/new-oracle-graalvm-container-images), which as of JDK 17, are now under the [GraalVM Free License](https://blogs.oracle.com/java/post/graalvm-free-license) incorporating what used to be known as the GraalVM Enterprise. 

examples/bmc4/docker-compose.yml

@@ -1,20 +1,20 @@
-services:
+services:
-  mc:
+  mc:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server
-    environment:
+    environment:
-      EULA: true
+      EULA: true
-      MODPACK_PLATFORM: MODRINTH
+      MODPACK_PLATFORM: MODRINTH
-      # NOTE: v36 doesn't startup correctly
+      MODRINTH_MODPACK: https://modrinth.com/modpack/better-mc-forge-bmc4/version/v32.5
-      MODRINTH_MODPACK: https://modrinth.com/modpack/better-mc-forge-bmc4/version/v34.5
+      MODRINTH_EXCLUDE_FILES: |
-      MODRINTH_OVERRIDES_EXCLUSIONS: |
+        XaeroPlus
-        config/paxi/datapacks/BE_default_endgen_fix*
+        XaerosWorldMap
-      MODRINTH_FORCE_SYNCHRONIZE: true
+      MODRINTH_OVERRIDES_EXCLUSIONS: |
-      MEMORY: 4G
+        mods/citresewn-*.jar
-    ports:
+        **/datapacks/BE_default_endgen_fix*
-      - "25565:25565"
+      MODRINTH_FORCE_SYNCHRONIZE: true
-    volumes:
+      MEMORY: 4G
-      - mc-data:/data
+    ports:
-      # or use a host directory binding
+      - "25565:25565"
-#      - ./data:/data
+    # declare /data volume mapping as desired
-volumes:
+#    volumes:
-  mc-data:
+#      - ./data:/data

examples/docker-compose-paper.yml

@@ -1,16 +1,16 @@
 services:
   mc:
     image: itzg/minecraft-server
-    tty: true
+    container_name: paper
-    stdin_open: true
     environment:
       EULA: "true"
       TYPE: PAPER
+      VIEW_DISTANCE: 10
       MEMORY: 2G
     ports:
       - "25565:25565"
     volumes:
-      - mc-data:/data
+      - mc-paper:/data
     restart: unless-stopped
 volumes:
-  mc-data: {}
+  mc-paper: {}

examples/fabric/compose.yml

@@ -7,10 +7,6 @@ services:
 #      VERSION: 1.21.4
 #      FABRIC_INSTALLER_VERSION: 1.0.1
 #      FABRIC_LOADER_VERSION: 0.16.10
-      # Since Fabric server type only includes the loader, most times
-      # the fabric-api is required for other mods to function
-      MODRINTH_PROJECTS: |
-        fabric-api
     ports:
       - "25565:25565"
     volumes:

files/auto/autopause-fcns.sh

@@ -25,17 +25,11 @@ use_proxy() {
 }
 
 use_server_list_ping() {
-  if [[ "${VERSION^^}" == "LATEST" || "${VERSION^^}" == "SNAPSHOT" ]]; then
-    # Don't use server-list ping for unknown version
-    return 1
-  fi
-
   if versionLessThan 1.7; then
     echo "--use-server-list-ping"
   fi
 }
 
-
 mc_server_listening() {
   mc-monitor status $(use_proxy) --host "${SERVER_HOST:-localhost}" --port "$SERVER_PORT" $(use_server_list_ping) --timeout 10s >&/dev/null
 }

scripts/start-configuration

@@ -32,15 +32,14 @@ isDebugging && set -x
 export HOME=/data
 
 log "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
-log "Image info: $(paste -d, -s /etc/image.properties)"
 
 if [ ! -e /data/eula.txt ]; then
   if ! isTrue "$EULA"; then
     log ""
     logError "Please accept the Minecraft EULA at"
     logError "  https://account.mojang.com/documents/minecraft_eula"
-    logError "by adding the following immediately after 'docker run':"
+    logError "by setting the container environment variable "
-    logError "  -e EULA=TRUE"
+    logError "EULA to \"true\""
     log ""
     exit 1
   fi
@@ -286,4 +285,4 @@ case "${TYPE^^}" in
       exit 1
   ;;
 
-esac
+esac

scripts/start-setupMounts

@@ -38,7 +38,7 @@ function mc-image-helper-mounts(){
 : "${COPY_PLUGINS_SRC:="/plugins"}"
 : "${COPY_PLUGINS_DEST:=${PLUGINS_OUT_DIR}}"
 
-if usesPlugins; then
+if usesPlugins && [ -d "${COPY_PLUGINS_SRC}" ]; then
   mkdir -p "${COPY_PLUGINS_DEST}"
   log "Copying any plugins from ${COPY_PLUGINS_SRC} to ${COPY_PLUGINS_DEST}"
   mc-image-helper-mounts "${COPY_PLUGINS_SRC}" "${COPY_PLUGINS_DEST}"
@@ -47,7 +47,7 @@ fi
 : "${COPY_MODS_SRC:="/mods"}"
 : "${COPY_MODS_DEST:=${MODS_OUT_DIR}}"
 
-if usesMods; then
+if usesMods && [ -d "${COPY_MODS_SRC}" ]; then
   log "Copying any mods from ${COPY_MODS_SRC} to ${COPY_MODS_DEST}"
   mc-image-helper-mounts "${COPY_MODS_SRC}" "${COPY_MODS_DEST}"
 fi
@@ -55,7 +55,9 @@ fi
 : "${COPY_CONFIG_SRC:="/config"}"
 : "${COPY_CONFIG_DEST:="/data/config"}"
 
-log "Copying any configs from ${COPY_CONFIG_SRC} to ${COPY_CONFIG_DEST}"
+if [ -d "${COPY_CONFIG_SRC}" ]; then
-mc-image-helper-mounts "${COPY_CONFIG_SRC}" "${COPY_CONFIG_DEST}"
+  log "Copying any configs from ${COPY_CONFIG_SRC} to ${COPY_CONFIG_DEST}"
+  mc-image-helper-mounts "${COPY_CONFIG_SRC}" "${COPY_CONFIG_DEST}"
+fi
 
 exec "${SCRIPTS:-/}start-setupServerProperties" "$@"

tests/setuponlytests/auto_curseforge/docker-compose.yml

@@ -6,8 +6,10 @@ services:
       SETUP_ONLY: "TRUE"
       MODPACK_PLATFORM: AUTO_CURSEFORGE
       CF_API_KEY: ${CF_API_KEY}
-      CF_PAGE_URL: https://www.curseforge.com/minecraft/modpacks/the-pixelmon-modpack/files/5954570
+      CF_SLUG: the-pixelmon-modpack
-      DEBUG: true
+      CF_FILENAME_MATCHER: "9.1.2"
+      # Use the image bundled one to ensure latest is being tested
+      CF_EXCLUDE_INCLUDE_FILE: /image/cf-exclude-include.json
     volumes:
       - ./data:/data
 

tests/setuponlytests/cf_files/docker-compose.yml

@@ -6,7 +6,7 @@ services:
       EULA: "TRUE"
       SETUP_ONLY: "TRUE"
       TYPE: FABRIC
-      VERSION: 1.20.1
+      VERSION: 1.18.2
       # Contains mix of Forge and Fabric mods
       CURSEFORGE_FILES: |
         https://www.curseforge.com/minecraft/mc-mods/clumps/files/4153343

tests/setuponlytests/cf_files/listing.txt

@@ -1 +1 @@
-architectury-api@9.2.14
+architectury-api@4.12.94

tests/setuponlytests/test.sh

@@ -47,7 +47,6 @@ setupOnlyMinecraftTest(){
   status=PASSED
   verify=
   if ! logs=$(docker compose run --rm -e SETUP_ONLY=true -e DEBUG="${DEBUG:-false}" mc 2>&1); then
-    status=FAILED
     outputContainerLog "$logs"
     result=1
   elif [ -f verify.sh ]; then