From 7c918d455fb3627e38bc10a1afc5057be09fb778 Mon Sep 17 00:00:00 2001 From: Oracle Public Cloud User Date: Tue, 10 May 2022 22:57:21 +0200 Subject: [PATCH 1/7] add start-deploy script for Quilt --- scripts/start-deployQuilt | 52 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100755 scripts/start-deployQuilt diff --git a/scripts/start-deployQuilt b/scripts/start-deployQuilt new file mode 100755 index 00000000000..2b8e6433cf7 --- /dev/null +++ b/scripts/start-deployQuilt @@ -0,0 +1,52 @@ +#!/bin/bash +set -eu + +# shellcheck source=start-utils +. "${SCRIPTS:-/}start-utils" + +requireVar VANILLA_VERSION +export TYPE=QUILT +: "${QUILT_LAUNCHER_VERSION:=${QUILT_INSTALLER_VERSION:-LATEST}}" +: "${QUILT_LAUNCHER:=}" +: "${QUILT_LAUNCHER_URL:=}" +: "${QUILT_LOADER_VERSION:=LATEST}" + +isDebugging && set -x + +# Custom quilt jar +if [[ $QUILT_LAUNCHER ]]; then + export SERVER=${QUILT_LAUNCHER} +# Custom quilt jar url +elif [[ $QUILT_LAUNCHER_URL ]]; then + export SERVER=quilt-server-$(echo -n "$QUILT_LAUNCHER_URL" | mc-image-helper hash) +# Official quilt launcher +else + if [[ ${QUILT_LOADER_VERSION^^} = LATEST ]]; then + log "Checking Quilt Loader version information." + QUILT_LOADER_VERSION=$(maven-metadata-release https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/maven-metadata.xml) + fi + export INSTALLER=quilt-installer-${QUILT_LOADER_VERSION}.jar + export SERVER=quilt-server-launch.jar + export QUILT_LAUNCHER_URL="https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/${QUILT_LOADER_VERSION}/quilt-installer-${QUILT_LOADER_VERSION}.jar" +fi + +if [[ ! -e ${SERVER} && ! -z ${QUILT_LAUNCHER_URL} ]]; then + log "Downloading and installing $QUILT_LAUNCHER_URL ..." + if ! get -o "$INSTALLER" "$QUILT_LAUNCHER_URL"; then + log "Failed to download from given location $QUILT_LAUNCHER_URL" + exit 2 + fi + if ! java -jar ${INSTALLER} install server ${VANILLA_VERSION} --install-dir=./ --download-server; then + log "Failed to install $INSTALLER" + exit 2 + fi +fi + + +if [[ ! -e ${SERVER} ]]; then + log "$SERVER does not exist, cannot launch server!" + exit 1 +fi + +export FAMILY=QUILT +exec "${SCRIPTS:-/}start-setupWorld" "$@" From 0e3b18623d6fbe75d4c0f3bd688adc11ac062fda Mon Sep 17 00:00:00 2001 From: Felix Fischer Date: Tue, 10 May 2022 23:04:53 +0200 Subject: [PATCH 2/7] add start script for Quilt --- scripts/start-deployQuilt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start-deployQuilt b/scripts/start-deployQuilt index 2b8e6433cf7..289bdc2a078 100755 --- a/scripts/start-deployQuilt +++ b/scripts/start-deployQuilt @@ -19,7 +19,7 @@ if [[ $QUILT_LAUNCHER ]]; then # Custom quilt jar url elif [[ $QUILT_LAUNCHER_URL ]]; then export SERVER=quilt-server-$(echo -n "$QUILT_LAUNCHER_URL" | mc-image-helper hash) -# Official quilt launcher +# Official quilt installer else if [[ ${QUILT_LOADER_VERSION^^} = LATEST ]]; then log "Checking Quilt Loader version information." From 5657a2bac655659f12177207c35796d66a40e3c4 Mon Sep 17 00:00:00 2001 From: Felix Fischer Date: Tue, 10 May 2022 23:36:08 +0200 Subject: [PATCH 3/7] update README.md, add case entry --- README.md | 24 ++++++++++++++++++++++++ scripts/start-configuration | 4 ++++ scripts/start-deployQuilt | 13 +++++++------ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bc88a72be61..9b376dd61ab 100644 --- a/README.md +++ b/README.md @@ -486,6 +486,30 @@ docker run -d -v /path/on/host:/data ... \ See the [Working with mods and plugins](#working-with-mods-and-plugins) section to set up Fabric mods and configuration. +### Running a Quilt Server + +Enable [Quilt server](https://quiltmc.org/) mode by adding a `-e TYPE=QUILT` to your command-line. + +``` +docker run -d -v /path/on/host:/data \ + -e TYPE=QUILT \ + -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server +``` + +By default, the container will install the latest [quilt server launcher](https://quiltmc.org/install/server/), using the latest [quilt-installer](https://github.com/QuiltMC/quilt-installer) against the minecraft version you have defined with `VERSION` (defaulting to the latest vanilla release of the game). + +A specific loader version other than the latest can be requested using `QUILT_SERVER_VERSION`, such as: + +``` +docker run -d -v /path/on/host:/data ... \ + -e TYPE=QUILT \ + -e QUILT_SERVER_VERSION=1.17.1 +``` + +> If you wish to use an alternative launcher you can rovide the path to a custom launcher jar available to the container with `QUILT_LAUNCHER`, relative to `/data` (such as `-e QUILT_LAUNCHER=quilt-server-custom.jar`) + +See the [Working with mods and plugins](#working-with-mods-and-plugins) section to set up Quilt mods and configuration. + ### Running a Bukkit/Spigot server Enable Bukkit/Spigot server mode by adding a `-e TYPE=BUKKIT` or `-e TYPE=SPIGOT` to your command-line. diff --git a/scripts/start-configuration b/scripts/start-configuration index 78082a96c0e..db6f2e62f88 100755 --- a/scripts/start-configuration +++ b/scripts/start-configuration @@ -176,6 +176,10 @@ case "${TYPE^^}" in exec "${SCRIPTS:-/}start-deployFabric" "$@" ;; + QUILT) + exec "${SCRIPTS:-/}start-deployQuilt" "$@" + ;; + FTBA) evaluateJavaCompatibilityForForge exec "${SCRIPTS:-/}start-deployFTBA" "$@" diff --git a/scripts/start-deployQuilt b/scripts/start-deployQuilt index 289bdc2a078..c88187cab3e 100755 --- a/scripts/start-deployQuilt +++ b/scripts/start-deployQuilt @@ -9,7 +9,8 @@ export TYPE=QUILT : "${QUILT_LAUNCHER_VERSION:=${QUILT_INSTALLER_VERSION:-LATEST}}" : "${QUILT_LAUNCHER:=}" : "${QUILT_LAUNCHER_URL:=}" -: "${QUILT_LOADER_VERSION:=LATEST}" +: "${QUILT_INSTALLER_VERSION:=LATEST}" +: "${QUILT_SERVER_VERSION:=${VANILLA_VERSION}}" isDebugging && set -x @@ -21,13 +22,13 @@ elif [[ $QUILT_LAUNCHER_URL ]]; then export SERVER=quilt-server-$(echo -n "$QUILT_LAUNCHER_URL" | mc-image-helper hash) # Official quilt installer else - if [[ ${QUILT_LOADER_VERSION^^} = LATEST ]]; then + if [[ ${QUILT_INSTALLER_VERSION^^} = LATEST ]]; then log "Checking Quilt Loader version information." - QUILT_LOADER_VERSION=$(maven-metadata-release https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/maven-metadata.xml) + QUILT_INSTALLER_VERSION=$(maven-metadata-release https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/maven-metadata.xml) fi - export INSTALLER=quilt-installer-${QUILT_LOADER_VERSION}.jar + export INSTALLER=quilt-installer-${QUILT_INSTALLER_VERSION}.jar export SERVER=quilt-server-launch.jar - export QUILT_LAUNCHER_URL="https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/${QUILT_LOADER_VERSION}/quilt-installer-${QUILT_LOADER_VERSION}.jar" + export QUILT_LAUNCHER_URL="https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/${QUILT_INSTALLER_VERSION}/quilt-installer-${QUILT_INSTALLER_VERSION}.jar" fi if [[ ! -e ${SERVER} && ! -z ${QUILT_LAUNCHER_URL} ]]; then @@ -36,7 +37,7 @@ if [[ ! -e ${SERVER} && ! -z ${QUILT_LAUNCHER_URL} ]]; then log "Failed to download from given location $QUILT_LAUNCHER_URL" exit 2 fi - if ! java -jar ${INSTALLER} install server ${VANILLA_VERSION} --install-dir=./ --download-server; then + if ! java -jar ${INSTALLER} install server ${QUILT_SERVER_VERSION} --install-dir=./ --download-server; then log "Failed to install $INSTALLER" exit 2 fi From 115c2d36275ee8c0829fbb6afd0dd4a534465c4d Mon Sep 17 00:00:00 2001 From: Felix Fischer Date: Tue, 10 May 2022 23:38:38 +0200 Subject: [PATCH 4/7] update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9b376dd61ab..97b77d5c16c 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Server types](#server-types) * [Running a Forge Server](#running-a-forge-server) * [Running a Fabric Server](#running-a-fabric-server) + * [Running a Quilt Server](#running-a-quilt-server) * [Running a Bukkit/Spigot server](#running-a-bukkitspigot-server) * [Running a Paper server](#running-a-paper-server) * [Running an Airplane server](#running-an-airplane-server) From ceee594b6ff929c0fdebdf7bb4dc1c1bc67741f1 Mon Sep 17 00:00:00 2001 From: Felix Fischer Date: Wed, 11 May 2022 23:17:24 +0200 Subject: [PATCH 5/7] finishing touches & add test --- README.md | 9 ++++-- scripts/start-deployQuilt | 31 ++++++++++++------- tests/setuponlytests/quilt/docker-compose.yml | 13 ++++++++ tests/setuponlytests/quilt/require.sh | 1 + tests/setuponlytests/quilt/verify.sh | 1 + 5 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 tests/setuponlytests/quilt/docker-compose.yml create mode 100644 tests/setuponlytests/quilt/require.sh create mode 100644 tests/setuponlytests/quilt/verify.sh diff --git a/README.md b/README.md index 97b77d5c16c..50278f2805a 100644 --- a/README.md +++ b/README.md @@ -499,15 +499,18 @@ docker run -d -v /path/on/host:/data \ By default, the container will install the latest [quilt server launcher](https://quiltmc.org/install/server/), using the latest [quilt-installer](https://github.com/QuiltMC/quilt-installer) against the minecraft version you have defined with `VERSION` (defaulting to the latest vanilla release of the game). -A specific loader version other than the latest can be requested using `QUILT_SERVER_VERSION`, such as: +A specific loader or installer version other than the latest can be requested using `QUILT_LOADER_VERSION` and `QUILT_INSTALLER_VERSION` respectively, such as: ``` docker run -d -v /path/on/host:/data ... \ -e TYPE=QUILT \ - -e QUILT_SERVER_VERSION=1.17.1 + -e QUILT_LOADER_VERSION=0.16.0 \ + -e QUILT_INSTALLER_VERSION=0.4.1 ``` -> If you wish to use an alternative launcher you can rovide the path to a custom launcher jar available to the container with `QUILT_LAUNCHER`, relative to `/data` (such as `-e QUILT_LAUNCHER=quilt-server-custom.jar`) +> If you wish to use an alternative launcher you can: +> * Provide the path to a custom launcher jar available to the container with `QUILT_LAUNCHER`, relative to `/data` (such as `-e QUILT_LAUNCHER=quilt-server-custom.jar`) +> * Provide the URL to a custom launcher jar with `QUILT_LAUNCHER_URL` (such as `-e QUILT_LAUNCHER_URL=http://HOST/quilt-server-custom.jar`) See the [Working with mods and plugins](#working-with-mods-and-plugins) section to set up Quilt mods and configuration. diff --git a/scripts/start-deployQuilt b/scripts/start-deployQuilt index c88187cab3e..ad46d248bf9 100755 --- a/scripts/start-deployQuilt +++ b/scripts/start-deployQuilt @@ -6,11 +6,11 @@ set -eu requireVar VANILLA_VERSION export TYPE=QUILT -: "${QUILT_LAUNCHER_VERSION:=${QUILT_INSTALLER_VERSION:-LATEST}}" : "${QUILT_LAUNCHER:=}" : "${QUILT_LAUNCHER_URL:=}" +: "${QUILT_INSTALLER_URL:=}" : "${QUILT_INSTALLER_VERSION:=LATEST}" -: "${QUILT_SERVER_VERSION:=${VANILLA_VERSION}}" +: "${QUILT_LOADER_VERSION:=LATEST}" isDebugging && set -x @@ -23,31 +23,38 @@ elif [[ $QUILT_LAUNCHER_URL ]]; then # Official quilt installer else if [[ ${QUILT_INSTALLER_VERSION^^} = LATEST ]]; then - log "Checking Quilt Loader version information." + log "Checking Quilt Installer version information." QUILT_INSTALLER_VERSION=$(maven-metadata-release https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/maven-metadata.xml) fi + if [[ ${QUILT_LOADER_VERSION^^} = LATEST ]]; then + log "Checking Quilt Loader version information." + QUILT_LOADER_VERSION=$(maven-metadata-release https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-loader/maven-metadata.xml) + fi export INSTALLER=quilt-installer-${QUILT_INSTALLER_VERSION}.jar - export SERVER=quilt-server-launch.jar - export QUILT_LAUNCHER_URL="https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/${QUILT_INSTALLER_VERSION}/quilt-installer-${QUILT_INSTALLER_VERSION}.jar" + export SERVER=quilt-server-${VANILLA_VERSION}-${QUILT_LOADER_VERSION}-launch.jar + export QUILT_INSTALLER_URL="https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/${QUILT_INSTALLER_VERSION}/quilt-installer-${QUILT_INSTALLER_VERSION}.jar" fi -if [[ ! -e ${SERVER} && ! -z ${QUILT_LAUNCHER_URL} ]]; then - log "Downloading and installing $QUILT_LAUNCHER_URL ..." - if ! get -o "$INSTALLER" "$QUILT_LAUNCHER_URL"; then - log "Failed to download from given location $QUILT_LAUNCHER_URL" +if [[ ! -e ${SERVER} && ! -z ${QUILT_INSTALLER_URL} ]]; then + log "Downloading and installing $QUILT_INSTALLER_URL ..." + if ! get -o "$INSTALLER" "$QUILT_INSTALLER_URL"; then + log "Failed to download from given location $QUILT_INSTALLER_URL" exit 2 fi - if ! java -jar ${INSTALLER} install server ${QUILT_SERVER_VERSION} --install-dir=./ --download-server; then + if ! java -jar ${INSTALLER} install server ${VANILLA_VERSION} ${QUILT_LOADER_VERSION} --install-dir=./ --download-server; then log "Failed to install $INSTALLER" exit 2 fi + if ! mv quilt-server-launch.jar ${SERVER}; then + log "Failed to rename $SERVER" + exit 2 + fi fi - if [[ ! -e ${SERVER} ]]; then log "$SERVER does not exist, cannot launch server!" exit 1 fi -export FAMILY=QUILT +export FAMILY=FABRIC exec "${SCRIPTS:-/}start-setupWorld" "$@" diff --git a/tests/setuponlytests/quilt/docker-compose.yml b/tests/setuponlytests/quilt/docker-compose.yml new file mode 100644 index 00000000000..60c2aa3901a --- /dev/null +++ b/tests/setuponlytests/quilt/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3" + +services: + mc: + restart: "no" + image: ${IMAGE_TO_TEST:-itzg/minecraft-server} + environment: + EULA: "TRUE" + SETUP_ONLY: "TRUE" + TYPE: QUILT + VERSION: ${MINECRAFT_VERSION:-LATEST} + volumes: + - ./data:/data diff --git a/tests/setuponlytests/quilt/require.sh b/tests/setuponlytests/quilt/require.sh new file mode 100644 index 00000000000..65b61c6c8dd --- /dev/null +++ b/tests/setuponlytests/quilt/require.sh @@ -0,0 +1 @@ +[[ $MINECRAFT_VERSION == LATEST ]] || exit 1 diff --git a/tests/setuponlytests/quilt/verify.sh b/tests/setuponlytests/quilt/verify.sh new file mode 100644 index 00000000000..8d06eb4bd4c --- /dev/null +++ b/tests/setuponlytests/quilt/verify.sh @@ -0,0 +1 @@ +mc-image-helper assert fileExists "/data/quilt-server-launch-*.jar" From f2e32f43f495230005146eaf233886d325c1dbfd Mon Sep 17 00:00:00 2001 From: Felix Fischer Date: Wed, 11 May 2022 23:32:07 +0200 Subject: [PATCH 6/7] merge with upstream --- .github/workflows/build-multiarch.yml | 6 +- .github/workflows/generate-toc.yml | 21 ---- .github/workflows/pr.yml | 4 +- README.md | 137 -------------------------- scripts/start-finalExec | 6 +- 5 files changed, 8 insertions(+), 166 deletions(-) delete mode 100644 .github/workflows/generate-toc.yml diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index efa0a595100..563ba4025a6 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -88,7 +88,7 @@ jobs: - name: Docker meta id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: # NOTE for forks: if your Docker Hub organization doesn't match your Github repo's, # then the use of ${{ github.repository_owner }} will need to be replaced. @@ -107,10 +107,10 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Set up QEMU - uses: docker/setup-qemu-action@v1.2.0 + uses: docker/setup-qemu-action@v2.0.0 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/generate-toc.yml b/.github/workflows/generate-toc.yml deleted file mode 100644 index 59b96f8e6b6..00000000000 --- a/.github/workflows/generate-toc.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Generate README table of contents -on: - push: - branches: - - master - paths: - - README.md -jobs: - generate: - if: github.repository == 'itzg/docker-minecraft-server' - runs-on: ubuntu-latest - timeout-minutes: 5 - steps: - - uses: actions/checkout@v3 - - run: | - curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc - chmod a+x gh-md-toc - ./gh-md-toc --insert --no-backup README.md - - uses: stefanzweifel/git-auto-commit-action@v4.14.1 - with: - commit_message: "docs: Auto update markdown TOC" \ No newline at end of file diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 59892cf5b44..4de1198a7b7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -41,14 +41,14 @@ jobs: - name: Gather Docker metadata if: contains(github.event.pull_request.labels.*.name, 'ci/push-image') id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: | itzg/minecraft-server - name: Login to DockerHub if: contains(github.event.pull_request.labels.*.name, 'ci/push-image') - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/README.md b/README.md index 50278f2805a..54b15e54fd7 100644 --- a/README.md +++ b/README.md @@ -21,143 +21,6 @@ where, in this case, the standard server port 25565, will be exposed on your hos By default, the container will download the latest version of the "vanilla" [Minecraft: Java Edition server](https://www.minecraft.net/en-us/download/server) provided by Mojang. The [`VERSION`](#versions) and the [`TYPE`](#server-types) can be configured to create many variations of desired Minecraft server. -**TABLE OF CONTENTS** - - - * [Mitigated Log4jShell Vulnerability](#mitigated-log4jshell-vulnerability) - * [Looking for a Bedrock Dedicated Server](#looking-for-a-bedrock-dedicated-server) - * [Interacting with the server](#interacting-with-the-server) - * [Data Directory](#data-directory) - * [Attaching data directory to host filesystem](#attaching-data-directory-to-host-filesystem) - * [Converting anonymous /data volume to named volume](#converting-anonymous-data-volume-to-named-volume) - * [Versions](#versions) - * [Running Minecraft server on different Java version](#running-minecraft-server-on-different-java-version) - * [Deprecated Image Tags](#deprecated-image-tags) - * [Related Projects](#related-projects) - * [itzg/minecraft-bedrock-server](#itzgminecraft-bedrock-server) - * [mc-router](#mc-router) - * [itzg/bungeecord](#itzgbungeecord) - * [itzg/mc-backup](#itzgmc-backup) - * [rcon-cli](#rcon-cli) - * [mc-monitor](#mc-monitor) - * [mc-image-helper](#mc-image-helper) - * [Healthcheck](#healthcheck) - * [Deployment Templates and Examples](#deployment-templates-and-examples) - * [Helm Charts](#helm-charts) - * [Examples](#examples) - * [Amazon Web Services (AWS) Deployment](#amazon-web-services-aws-deployment) - * [Using Docker Compose](#using-docker-compose) - * [Troubleshooting](#troubleshooting) - * [Server types](#server-types) - * [Running a Forge Server](#running-a-forge-server) - * [Running a Fabric Server](#running-a-fabric-server) - * [Running a Quilt Server](#running-a-quilt-server) - * [Running a Bukkit/Spigot server](#running-a-bukkitspigot-server) - * [Running a Paper server](#running-a-paper-server) - * [Running an Airplane server](#running-an-airplane-server) - * [Running a Pufferfish server](#running-a-pufferfish-server) - * [Running a Purpur server](#running-a-purpur-server) - * [Running a Magma server](#running-a-magma-server) - * [Running a Mohist server](#running-a-mohist-server) - * [Running a Catserver type server](#running-a-catserver-type-server) - * [Running a Loliserver type server](#running-a-loliserver-type-server) - * [Running a Canyon server](#running-a-canyon-server) - * [Running a SpongeVanilla server](#running-a-spongevanilla-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) - * [Example](#example) - * [Running a server with a CurseForge modpack](#running-a-server-with-a-curseforge-modpack) - * [Modpack data directory](#modpack-data-directory) - * [Buggy start scripts](#buggy-start-scripts) - * [Fixing "unable to launch forgemodloader"](#fixing-unable-to-launch-forgemodloader) - * [Running a server with a packwiz modpack](#running-a-server-with-a-packwiz-modpack) - * [Working with mods and plugins](#working-with-mods-and-plugins) - * [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, Fabric, and Bukkit-like Servers](#downloadable-modplugin-pack-for-forge-fabric-and-bukkit-like-servers) - * [ForgeAPI usage to use non-version specific projects](#forgeapi-usage-to-use-non-version-specific-projects) - * [Generic pack files](#generic-pack-files) - * [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) - * [Cloning world from a container path](#cloning-world-from-a-container-path) - * [Overwrite world on start](#overwrite-world-on-start) - * [Datapacks](#datapacks) - * [VanillaTweaks](#vanillatweaks) - * [Server configuration](#server-configuration) - * [Message of the Day](#message-of-the-day) - * [Difficulty](#difficulty) - * [Whitelist Players](#whitelist-players) - * [Op/Administrator Players](#opadministrator-players) - * [Server icon](#server-icon) - * [Rcon](#rcon) - * [Query](#query) - * [Max players](#max-players) - * [Max world size](#max-world-size) - * [Allow Nether](#allow-nether) - * [Announce Player Achievements](#announce-player-achievements) - * [Enable Command Block](#enable-command-block) - * [Force Gamemode](#force-gamemode) - * [Generate Structures](#generate-structures) - * [Hardcore](#hardcore) - * [Snooper](#snooper) - * [Max Build Height](#max-build-height) - * [Max Tick Time](#max-tick-time) - * [Spawn Animals](#spawn-animals) - * [Spawn Monsters](#spawn-monsters) - * [Spawn NPCs](#spawn-npcs) - * [Set spawn protection](#set-spawn-protection) - * [View Distance](#view-distance) - * [Level Seed](#level-seed) - * [Game Mode](#game-mode) - * [PVP Mode](#pvp-mode) - * [Level Type and Generator Settings](#level-type-and-generator-settings) - * [Custom Server Resource Pack](#custom-server-resource-pack) - * [Level / World Save Name](#level--world-save-name) - * [Online mode](#online-mode) - * [Allow flight](#allow-flight) - * [Server name](#server-name) - * [Server port](#server-port) - * [Other server property mappings](#other-server-property-mappings) - * [Miscellaneous Options](#miscellaneous-options) - * [Replacing variables inside configs](#replacing-variables-inside-configs) - * [Patching existing files](#patching-existing-files) - * [Running with a custom server JAR](#running-with-a-custom-server-jar) - * [Force re-download of the server file](#force-re-download-of-the-server-file) - * [Running as alternate user/group ID](#running-as-alternate-usergroup-id) - * [Memory Limit](#memory-limit) - * [JVM Options](#jvm-options) - * [Interactive and Color Console](#interactive-and-color-console) - * [Server Shutdown Options](#server-shutdown-options) - * [OpenJ9 Specific Options](#openj9-specific-options) - * [Enabling rolling logs](#enabling-rolling-logs) - * [Timezone Configuration](#timezone-configuration) - * [Enable Remote JMX for Profiling](#enable-remote-jmx-for-profiling) - * [Enable Aikar's Flags](#enable-aikars-flags) - * [HTTP Proxy](#http-proxy) - * [Using "noconsole" option](#using-noconsole-option) - * [Explicitly disable GUI](#explicitly-disable-gui) - * [Stop Duration](#stop-duration) - * [Setup only](#setup-only) - * [Enable Flare Flags](#enable-flare-flags) - * [Enable timestamps in init logs](#enable-timestamps-in-init-logs) - * [Use RCON commands](#use-rcon-commands) - * [Autopause](#autopause) - * [Description](#description) - * [Enabling Autopause](#enabling-autopause) - * [Autostop](#autostop) - * [Running on RaspberryPi](#running-on-raspberrypi) - * [Contributing](#contributing) - - - - - - ## Mitigated Log4jShell Vulnerability **Please ensure you have pulled the latest image** since [all official mitigations](https://www.minecraft.net/en-us/article/important-message--security-vulnerability-java-edition) are automatically applied by the container startup process. diff --git a/scripts/start-finalExec b/scripts/start-finalExec index 6020456a398..98148748965 100755 --- a/scripts/start-finalExec +++ b/scripts/start-finalExec @@ -110,9 +110,9 @@ if [[ ${GUI,,} = false ]]; then EXTRA_ARGS+=" nogui" fi -: "${MEMORY:=1G}" -: "${INIT_MEMORY:=${MEMORY}}" -: "${MAX_MEMORY:=${MEMORY}}" +: "${MEMORY=1G}" +: "${INIT_MEMORY=${MEMORY}}" +: "${MAX_MEMORY=${MEMORY}}" expandedDOpts= if [ -n "$JVM_DD_OPTS" ]; then From 6f894fc6d5cb7cabc9d9852f276623eec0ff0af9 Mon Sep 17 00:00:00 2001 From: Felix Fischer Date: Thu, 12 May 2022 19:18:09 +0200 Subject: [PATCH 7/7] fix tests/setuponlytests/quilt/verify.sh --- tests/setuponlytests/quilt/verify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/setuponlytests/quilt/verify.sh b/tests/setuponlytests/quilt/verify.sh index 8d06eb4bd4c..0a85809413b 100644 --- a/tests/setuponlytests/quilt/verify.sh +++ b/tests/setuponlytests/quilt/verify.sh @@ -1 +1 @@ -mc-image-helper assert fileExists "/data/quilt-server-launch-*.jar" +mc-image-helper assert fileExists "/data/quilt-server-*-launch.jar"