From d5f1660c7775130a89c07b6c3f16c52a9b075bd4 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sun, 12 Dec 2021 20:08:13 -0600 Subject: [PATCH 1/7] docs: Removed docker-compose-paper.yml since it was out of date (#1195) --- README.md | 10 ++-------- examples/docker-compose-paper.yml | 18 ------------------ 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 examples/docker-compose-paper.yml diff --git a/README.md b/README.md index cd63f607..36a01dab 100644 --- a/README.md +++ b/README.md @@ -452,19 +452,13 @@ Plugins can either be managed within the `plugins` subdirectory of the [data dir Enable Paper server mode by adding a `-e TYPE=PAPER` to your command-line. -By default the container will run the latest build of [Paper server](https://papermc.io/downloads) -but you can also choose to run a specific build with `-e PAPERBUILD=205`. +By default, the container will run the latest build of [Paper server](https://papermc.io/downloads) but you can also choose to run a specific build with `-e PAPERBUILD=205`. docker run -d -v /path/on/host:/data \ -e TYPE=PAPER \ -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server -If you are hosting your own copy of Paper you can override the download URL with: - -- -e PAPER_DOWNLOAD_URL= - -An example compose file is provided at -[examples/docker-compose-paper.yml](examples/docker-compose-paper.yml). +If you are hosting your own copy of Paper you can override the download URL with `PAPER_DOWNLOAD_URL=`. 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. diff --git a/examples/docker-compose-paper.yml b/examples/docker-compose-paper.yml deleted file mode 100644 index 2c62dd4e..00000000 --- a/examples/docker-compose-paper.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: '3.8' - -services: - mc: - image: itzg/minecraft-server - environment: - EULA: "true" - TYPE: PAPER - VERSION: 1.9.4 - # needed for Paper versions before 1.14 - CONSOLE: "false" - ports: - - 25565:25565 - volumes: - - mc-paper:/data - -volumes: - mc-paper: From 79fa4b95c39897a30ad9c3d9208874d13cba9ee1 Mon Sep 17 00:00:00 2001 From: itzg Date: Mon, 13 Dec 2021 02:08:27 +0000 Subject: [PATCH 2/7] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 36a01dab..037b1b29 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Running on RaspberryPi](#running-on-raspberrypi) * [Contributing](#contributing) - + From 58c085527fccf1a2834021ea2ceeb7dd69896b75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Dec 2021 07:45:16 -0600 Subject: [PATCH 3/7] build(deps): bump actions/stale from 4.0.0 to 4.1.0 (#1196) --- .github/workflows/stale-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale-check.yml b/.github/workflows/stale-check.yml index 5709b313..8aa6e41b 100644 --- a/.github/workflows/stale-check.yml +++ b/.github/workflows/stale-check.yml @@ -12,7 +12,7 @@ jobs: pull-requests: write steps: - name: Process Stale Issues - uses: actions/stale@v4.0.0 + uses: actions/stale@v4.1.0 with: stale-issue-label: status/stale stale-pr-label: status/stale From 4e44f33db9f9d69f08d11844d5ecb3214cf96da1 Mon Sep 17 00:00:00 2001 From: Levy Ehrstein Date: Mon, 13 Dec 2021 20:50:20 +0100 Subject: [PATCH 4/7] fix: fabric downgrading not working (#1197, #1192) See #1192 for an in-depth explanation of the problem. Reported-by: Erik "Coding-Kiwi" --- scripts/start-deployFabric | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/start-deployFabric b/scripts/start-deployFabric index 770b03fb..b16694b5 100755 --- a/scripts/start-deployFabric +++ b/scripts/start-deployFabric @@ -24,7 +24,7 @@ fi export SERVER=fabric-server-${VANILLA_VERSION}-${FABRIC_INSTALLER_VERSION}.jar -if [[ ! -e ${SERVER} ]]; then +if [ ! \( -e ${SERVER} -a -e "server-${VANILLA_VERSION}.jar" \) ]; then if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then FABRIC_INSTALLER="fabric-installer-${FABRIC_INSTALLER_VERSION}.jar" @@ -70,8 +70,12 @@ if [[ ! -e ${SERVER} ]]; then exit 10 fi + mv server.jar "server-${VANILLA_VERSION}.jar" mv fabric-server-launch.jar "${SERVER}" fi +# Specify which server jar to run +echo "serverJar=server-${VANILLA_VERSION}.jar" > fabric-server-launcher.properties + export FAMILY=FABRIC exec "${SCRIPTS:-/}start-setupWorld" "$@" From c4d4d2bcc161f6363efa603be06d802b53a83626 Mon Sep 17 00:00:00 2001 From: woeisme Date: Mon, 13 Dec 2021 20:25:21 +0000 Subject: [PATCH 5/7] Created new template for docker-compose-paper.yml (#1198) --- examples/docker-compose-paper.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 examples/docker-compose-paper.yml diff --git a/examples/docker-compose-paper.yml b/examples/docker-compose-paper.yml new file mode 100644 index 00000000..a0e37f5a --- /dev/null +++ b/examples/docker-compose-paper.yml @@ -0,0 +1,19 @@ +version: '3.8' +services: + mc: + image: itzg/minecraft-server + container_name: paper + environment: + EULA: "true" + ENABLE_RCON: "true" + TYPE: PAPER + VIEW_DISTANCE: 10 + MEMORY: 2G + CONSOLE: "false" + ports: + - 25565:25565 + volumes: + - mc-paper:/data + restart: unless-stopped +volumes: + mc-paper: From bb56de694a5ce5e5a0a652b0c16e1e6f29633022 Mon Sep 17 00:00:00 2001 From: Jawa_Juice <67296752+Jawa-Juice@users.noreply.github.com> Date: Mon, 13 Dec 2021 21:14:16 -0500 Subject: [PATCH 6/7] Remove Airplane 1.16 as unsupported (#1199) --- README.md | 2 +- scripts/start-deployAirplane | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 037b1b29..d3ee39ff 100644 --- a/README.md +++ b/README.md @@ -470,7 +470,7 @@ An [Airplane](https://airplane.gg) server, which is "a stable, optimized, well s -e TYPE=AIRPLANE -> NOTE: The `VERSION` variable is used to select an Airplane branch to download from. The available options are "LATEST" "1.17" "1.16" "PURPUR" and "PURPUR-1.16" +> NOTE: The `VERSION` variable is used to select an Airplane branch to download from. The available options are "LATEST" "1.17" and "PURPUR" Extra variables: - `AIRPLANE_BUILD=lastSuccessfulBuild` : set a specific Airplane build to use diff --git a/scripts/start-deployAirplane b/scripts/start-deployAirplane index 45e06228..05e33202 100755 --- a/scripts/start-deployAirplane +++ b/scripts/start-deployAirplane @@ -6,8 +6,8 @@ isDebugging && set -x IFS=$'\n\t' -if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.16" ] && [ "${VERSION}" != "1.17" ] && [ "${VERSION}" != "PURPUR" ] && [ "${VERSION}" != "PURPUR-1.16" ] ; then - log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=1.17, VERSION=1.16, VERSION=PURPUR or VERSION=PURPUR-1.16. Note that these are branches, not #.#.# versions." +if [ "${VERSION}" != "LATEST" ] && [ "${VERSION}" != "1.17" ] && [ "${VERSION}" != "PURPUR" ] ; then + log "ERROR: Airplane server type only supports VERSION=LATEST, VERSION=1.17, VERSION=PURPUR. Note that these are branches, not #.#.# versions." exit 1 fi @@ -18,20 +18,11 @@ if [ "${VERSION}" = "LATEST" ] || [ "${VERSION}" = "1.17" ]; then AIRPLANE_BRANCH="1.17" fi -if [ "${VERSION}" = "1.16" ]; then - AIRPLANE_BRANCH="1.16" -fi - if [ "${VERSION}" = "PURPUR" ]; then AIRPLANE_BRANCH="Purpur-1.17" AIRPLANE_TYPE="airplanepurpur" fi -if [ "${VERSION}" = "PURPUR-1.16" ]; then - AIRPLANE_BRANCH="Purpur-1.16" - AIRPLANE_TYPE="airplanepurpur" -fi - log "Using Airplane-${AIRPLANE_BRANCH} branch" export SERVER=airplane-${AIRPLANE_BRANCH}-${AIRPLANE_BUILD}.jar From 39611fa9cbae2c4d477161d5983f5789bca34eef Mon Sep 17 00:00:00 2001 From: itzg Date: Tue, 14 Dec 2021 02:14:33 +0000 Subject: [PATCH 7/7] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3ee39ff..ad18af7f 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ By default, the container will download the latest version of the "vanilla" [Min * [Running on RaspberryPi](#running-on-raspberrypi) * [Contributing](#contributing) - +