mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-10-28 05:15:41 +00:00
Download Canyon from GitHub for final build (#2108)
This commit is contained in:
1 parent
bad30b5022
commit
828137fcdb
2 files changed
+18
-5
No files matched your search
@@ -541,9 +541,10 @@ A [Catserver](http://catserver.moe/) type server can be used with
|
|||||||
|
|
||||||
> **NOTE** only `VERSION=b1.7.3` is supported. Since that version pre-dates the health check mechanism used by this image, that will need to be disabled by setting `DISABLE_HEALTHCHECK=true`.
|
> **NOTE** only `VERSION=b1.7.3` is supported. Since that version pre-dates the health check mechanism used by this image, that will need to be disabled by setting `DISABLE_HEALTHCHECK=true`.
|
||||||
|
|
||||||
By default, the latest build will be used; however, a specific build number can be selected by setting `CANYON_BUILD`, such as
|
Canyon is on a temporary hiatus, so by default the final build from GitHub will be used; however, a specific build number can be selected in some instances by setting `CANYON_BUILD`, such as
|
||||||
|
|
||||||
-e CANYON_BUILD=11
|
-e CANYON_BUILD=6
|
||||||
|
-e CANYON_BUILD=26
|
||||||
|
|
||||||
### Running a SpongeVanilla server
|
### Running a SpongeVanilla server
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ IFS=$'\n\t'
|
|||||||
. "${SCRIPTS:-/}start-utils"
|
. "${SCRIPTS:-/}start-utils"
|
||||||
isDebugging && set -x
|
isDebugging && set -x
|
||||||
|
|
||||||
: "${CANYON_BUILD:=lastSuccessfulBuild}"
|
: "${CANYON_BUILD:=final}"
|
||||||
|
|
||||||
if [ "${VERSION}" != "b1.7.3" ]; then
|
if [ "${VERSION}" != "b1.7.3" ]; then
|
||||||
log "ERROR: Canyon server type only supports VERSION=b1.7.3"
|
log "ERROR: Canyon server type only supports VERSION=b1.7.3"
|
||||||
@@ -33,8 +33,20 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f "$SERVER" ]; then
|
if [ ! -f "$SERVER" ]; then
|
||||||
downloadUrl="${canyonJob}/${CANYON_BUILD}/artifact/${buildRelPath}"
|
# If CANYON_BUILD is final, then download from GitHub
|
||||||
log "Downloading Canyon build ${buildNumber} from $downloadUrl ..."
|
if [ "${CANYON_BUILD}" = "final" ]; then
|
||||||
|
downloadUrl="https://github.com/KoboDev/SupplyAndDemand/releases/download/finalcanyon/canyon-server.jar"
|
||||||
|
log "Downloading final Canyon build from $downloadUrl ..."
|
||||||
|
elif [ "${CANYON_BUILD}" = "6" ]; then
|
||||||
|
downloadUrl="https://github.com/KoboDev/SupplyAndDemand/releases/download/CanyonRelease/Canyon-Build-6.jar"
|
||||||
|
log "Downloading Canyon build 6 from $downloadUrl ..."
|
||||||
|
elif [ "${CANYON_BUILD}" = "26" ]; then
|
||||||
|
downloadUrl="https://github.com/KoboDev/SupplyAndDemand/releases/download/CanyonRelease/canyon-build-26.jar"
|
||||||
|
log "Downloading Canyon build 26 from $downloadUrl ..."
|
||||||
|
else
|
||||||
|
downloadUrl="${canyonJob}/${CANYON_BUILD}/artifact/${buildRelPath}"
|
||||||
|
log "Downloading Canyon build ${buildNumber} from $downloadUrl ..."
|
||||||
|
fi
|
||||||
curl -fsSL -o "$SERVER" "$downloadUrl"
|
curl -fsSL -o "$SERVER" "$downloadUrl"
|
||||||
if [ ! -f "$SERVER" ]; then
|
if [ ! -f "$SERVER" ]; then
|
||||||
log "ERROR: failed to download from $downloadUrl (status=$?)"
|
log "ERROR: failed to download from $downloadUrl (status=$?)"
|
||||||
|
|||||||
Reference in new issue
Block a user