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 diff --git a/README.md b/README.md index 40e6cecb..6d74d8d6 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) - + @@ -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. @@ -476,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/examples/docker-compose-paper.yml b/examples/docker-compose-paper.yml index 2c62dd4e..a0e37f5a 100644 --- a/examples/docker-compose-paper.yml +++ b/examples/docker-compose-paper.yml @@ -1,18 +1,19 @@ version: '3.8' - services: mc: image: itzg/minecraft-server + container_name: paper environment: EULA: "true" + ENABLE_RCON: "true" TYPE: PAPER - VERSION: 1.9.4 - # needed for Paper versions before 1.14 + VIEW_DISTANCE: 10 + MEMORY: 2G CONSOLE: "false" ports: - 25565:25565 volumes: - mc-paper:/data - + restart: unless-stopped volumes: mc-paper: 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 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" "$@"