mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-11-22 14:34:21 +00:00
adding major version for pufferfish (#1405)
* adding major version for pufferfish * fixing test as well as fixing a quote that was added due to linter recommendation * Changing get major version to using a simple cut command Co-authored-by: christopher blodgett <christopher.blodgett@gmail.com>
This commit is contained in:
1 parent
d9bddabbf8
commit
1ebe9d3f47
4 files changed
+11
-4
No files matched your search
@@ -116,7 +116,9 @@ case "X$VERSION" in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
export VANILLA_VERSION
|
export VANILLA_VERSION
|
||||||
log "Resolved version given ${VERSION} into ${VANILLA_VERSION}"
|
MAJOR_VANILLA_VERSION=$(get_major_version "$VANILLA_VERSION")
|
||||||
|
export MAJOR_VANILLA_VERSION
|
||||||
|
log "Resolved version given ${VERSION} into ${VANILLA_VERSION} and major version ${MAJOR_VANILLA_VERSION}"
|
||||||
|
|
||||||
cd /data || exit 1
|
cd /data || exit 1
|
||||||
|
|
||||||
|
|||||||
@@ -8,14 +8,14 @@ isDebugging && set -x
|
|||||||
|
|
||||||
IFS=$'\n\t'
|
IFS=$'\n\t'
|
||||||
|
|
||||||
if [[ "${VANILLA_VERSION}" != "1.18" ]] && [[ "${VANILLA_VERSION}" != "1.17" ]]; then
|
if [[ "${MAJOR_VANILLA_VERSION}" != "1.18" ]] && [[ "${MAJOR_VANILLA_VERSION}" != "1.17" ]]; then
|
||||||
log "ERROR: Pufferfish server type only supports versions 1.18 or 1.17, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc"
|
log "ERROR: Pufferfish server type only supports versions 1.18 or 1.17, use PUFFERFISH_BUILD to select the the correct build 47 => 1.18.1, 50 => 1.18.2 etc"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
: "${PUFFERFISH_BUILD:=lastSuccessfulBuild}"
|
: "${PUFFERFISH_BUILD:=lastSuccessfulBuild}"
|
||||||
|
|
||||||
PUFFERFISH_BUILD_JSON=$(curl -X GET -s "https://ci.pufferfish.host/job/Pufferfish-${VANILLA_VERSION}/${PUFFERFISH_BUILD}/api/json")
|
PUFFERFISH_BUILD_JSON=$(curl -X GET -s "https://ci.pufferfish.host/job/Pufferfish-${MAJOR_VANILLA_VERSION}/${PUFFERFISH_BUILD}/api/json")
|
||||||
# Example: "url": "https://ci.pufferfish.host/job/Pufferfish-1.18/50/",
|
# Example: "url": "https://ci.pufferfish.host/job/Pufferfish-1.18/50/",
|
||||||
PUFFERFISH_BUILD_URL=$(jq -n "$PUFFERFISH_BUILD_JSON" | jq -jc '.url // empty' )
|
PUFFERFISH_BUILD_URL=$(jq -n "$PUFFERFISH_BUILD_JSON" | jq -jc '.url // empty' )
|
||||||
# Example: "fileName": "pufferfish-paperclip-1.18.2-R0.1-SNAPSHOT-reobf.jar",
|
# Example: "fileName": "pufferfish-paperclip-1.18.2-R0.1-SNAPSHOT-reobf.jar",
|
||||||
|
|||||||
@@ -8,6 +8,11 @@ function join_by() {
|
|||||||
printf "%s" "${@/#/$d}"
|
printf "%s" "${@/#/$d}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function get_major_version() {
|
||||||
|
version=$1
|
||||||
|
echo "$version" | cut -d. -f 1-2
|
||||||
|
}
|
||||||
|
|
||||||
function isURL() {
|
function isURL() {
|
||||||
local value=$1
|
local value=$1
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ services:
|
|||||||
EULA: "TRUE"
|
EULA: "TRUE"
|
||||||
SETUP_ONLY: "TRUE"
|
SETUP_ONLY: "TRUE"
|
||||||
TYPE: PUFFERFISH
|
TYPE: PUFFERFISH
|
||||||
VERSION: 1.18
|
VERSION: ${MINECRAFT_VERSION:-LATEST}
|
||||||
PUFFERFISH_BUILD: 50
|
PUFFERFISH_BUILD: 50
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
Reference in new issue
Block a user