mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-11-10 02:37:09 +00:00
Added support for Catserver type
This commit is contained in:
1 parent
7d97fdcbec
commit
8f82ff9b1d
4 files changed
+46
-1
No files matched your search
@@ -534,6 +534,15 @@ A [Mohist](https://github.com/Mohist-Community/Mohist) server can be used with
|
|||||||
|
|
||||||
> **NOTE** there are limited base versions supported, so you will also need to set `VERSION`, such as "1.12.2"
|
> **NOTE** there are limited base versions supported, so you will also need to set `VERSION`, such as "1.12.2"
|
||||||
|
|
||||||
|
|
||||||
|
## Running a Catserver type server
|
||||||
|
|
||||||
|
A [Catserver](http://catserver.moe/) type server can be used with
|
||||||
|
|
||||||
|
-e TYPE=CATSERVER
|
||||||
|
|
||||||
|
> **NOTE** Catserver only provides a single release stream, so `VERSION` is ignored
|
||||||
|
|
||||||
## Running a server with a Feed the Beast modpack
|
## Running a server with a Feed the Beast modpack
|
||||||
|
|
||||||
> **NOTE** requires `itzg/minecraft-server:multiarch` image
|
> **NOTE** requires `itzg/minecraft-server:multiarch` image
|
||||||
|
|||||||
@@ -123,6 +123,10 @@ case "${TYPE^^}" in
|
|||||||
exec ${SCRIPTS:-/}start-deployMohist "$@"
|
exec ${SCRIPTS:-/}start-deployMohist "$@"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
CATSERVER)
|
||||||
|
exec ${SCRIPTS:-/}start-deployCatserver "$@"
|
||||||
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
log "Invalid type: '$TYPE'"
|
log "Invalid type: '$TYPE'"
|
||||||
log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
|
log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
. ${SCRIPTS:-/}start-utils
|
||||||
|
set -o pipefail
|
||||||
|
set -e
|
||||||
|
|
||||||
|
latestAsset=$(
|
||||||
|
curl -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/latest | \
|
||||||
|
jq '.assets[] | select(.name | match(".*-universal.jar"))'
|
||||||
|
)
|
||||||
|
|
||||||
|
if [[ -z "${latestAsset}" ]]; then
|
||||||
|
log "ERROR: latest release of Catserver is missing universal.jar asset"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
isDebugging && log "Latest asset ${latestAsset}"
|
||||||
|
latestJarName=$(echo ${latestAsset} | jq --raw-output '.name')
|
||||||
|
latestJarId=$(echo ${latestAsset} | jq --raw-output '.id')
|
||||||
|
|
||||||
|
|
||||||
|
export SERVER="/data/${latestJarName}"
|
||||||
|
|
||||||
|
if [ ! -f ${SERVER} ]; then
|
||||||
|
log "Downloading ${latestJarName}"
|
||||||
|
curl -H "Accept:application/octet-stream" -o "$SERVER" -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/assets/${latestJarId}
|
||||||
|
fi
|
||||||
|
|
||||||
|
export SKIP_LOG4J_CONFIG=true
|
||||||
|
|
||||||
|
# Continue to Final Setup
|
||||||
|
exec ${SCRIPTS:-/}start-finalSetup01World "$@"
|
||||||
+1
-1
@@ -33,7 +33,7 @@ fi
|
|||||||
export SERVER="/data/${baseName}"
|
export SERVER="/data/${baseName}"
|
||||||
|
|
||||||
if [ ! -f ${SERVER} ]; then
|
if [ ! -f ${SERVER} ]; then
|
||||||
log "Downloading ${SERVER}"
|
log "Downloading ${baseName}"
|
||||||
curl -o "${SERVER}" -fsSL "${mohistJob}lastSuccessfulBuild/artifact/${latestBuildRelPath}"
|
curl -o "${SERVER}" -fsSL "${mohistJob}lastSuccessfulBuild/artifact/${latestBuildRelPath}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user