Added support for preview versions (#302)
This commit is contained in:
1 parent
1ba7b841b4
commit
9fae57be3f
2 files changed
+62
-33
No files matched your search
@@ -17,7 +17,9 @@ docker run -d -it -e EULA=TRUE -p 19132:19132/udp -v mc-bedrock-data:/data itzg/
|
|||||||
|
|
||||||
## Upgrading to the latest Bedrock server version
|
## Upgrading to the latest Bedrock server version
|
||||||
|
|
||||||
With the `VERSION` variable set to `LATEST`, which is the default, then the Bedrock server can be upgraded by restarting the container. At every startup, the container checks for the latest version and upgrades, if needed.
|
With the `VERSION` variable set to "LATEST", which is the default, then the Bedrock server can be upgraded by restarting the container. At every startup, the container checks for the latest version and upgrades, if needed.
|
||||||
|
|
||||||
|
The latest preview version can be requested by setting `VERSION` to "PREVIEW".
|
||||||
|
|
||||||
## Looking for a Java Edition Server
|
## Looking for a Java Edition Server
|
||||||
|
|
||||||
@@ -32,14 +34,15 @@ For Minecraft Java Edition you'll need to use this image instead:
|
|||||||
- `EULA` (no default) : must be set to `TRUE` to
|
- `EULA` (no default) : must be set to `TRUE` to
|
||||||
accept the [Minecraft End User License Agreement](https://minecraft.net/terms)
|
accept the [Minecraft End User License Agreement](https://minecraft.net/terms)
|
||||||
- `VERSION` (`LATEST`) : can be set to a specific server version or the following special values can be used:
|
- `VERSION` (`LATEST`) : can be set to a specific server version or the following special values can be used:
|
||||||
- `LATEST` : determines the latest version and can be used to auto-upgrade on container start
|
- `LATEST` : determines the latest (non-preview) version and can be used to auto-upgrade on container start
|
||||||
|
- `PREVIEW` : determines the latest preview version and will auto-upgrade
|
||||||
- `PREVIOUS` : uses the previously maintained major version. Useful when the mobile app is gradually being upgraded across devices
|
- `PREVIOUS` : uses the previously maintained major version. Useful when the mobile app is gradually being upgraded across devices
|
||||||
- `1.11` : the latest version of 1.11
|
- `1.11` : the latest version of 1.11
|
||||||
- `1.12` : the latest version of 1.12
|
- `1.12` : the latest version of 1.12
|
||||||
- `1.13` : the latest version of 1.13
|
- `1.13` : the latest version of 1.13
|
||||||
- `1.14` : the latest version of 1.14
|
- `1.14` : the latest version of 1.14
|
||||||
- `1.16` : the latest version of 1.16
|
- `1.16` : the latest version of 1.16
|
||||||
- otherwise any specific server version can be provided to allow for temporary bug avoidance, etc
|
- otherwise any specific server version can be provided. If it is a preview version, also set `PREVIEW` to "true"
|
||||||
- `UID` (default derived from `/data` owner) : can be set to a specific user ID to run the
|
- `UID` (default derived from `/data` owner) : can be set to a specific user ID to run the
|
||||||
bedrock server process
|
bedrock server process
|
||||||
- `GID` (default derived from `/data` owner) : can be set to a specific group ID to run the
|
- `GID` (default derived from `/data` owner) : can be set to a specific group ID to run the
|
||||||
|
|||||||
+56
-30
@@ -3,6 +3,51 @@
|
|||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|
||||||
: "${TMP_DIR:=/tmp}"
|
: "${TMP_DIR:=/tmp}"
|
||||||
|
: "${PREVIEW:=false}"
|
||||||
|
|
||||||
|
function isTrue() {
|
||||||
|
case "${1,,}" in
|
||||||
|
true | on | 1)
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
function lookupVersion() {
|
||||||
|
platform=${1:?Missing required platform indicator}
|
||||||
|
|
||||||
|
for i in {1..3}; do
|
||||||
|
DOWNLOAD_URL=$(restify --user-agent=itzg/minecraft-bedrock-server --headers "accept-language:*" --attribute=data-platform="${platform}" "${downloadPage}" 2> restify.err | jq -r '.[0].href' || echo '')
|
||||||
|
if [[ ${DOWNLOAD_URL} ]]; then
|
||||||
|
break 2
|
||||||
|
fi
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
if [[ -z ${DOWNLOAD_URL} ]]; then
|
||||||
|
DOWNLOAD_URL=$(curl -s https://mc-bds-helper.vercel.app/api/latest)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ${DOWNLOAD_URL} =~ http.*/.*-(.*)\.zip ]]; then
|
||||||
|
VERSION=${BASH_REMATCH[1]}
|
||||||
|
elif [[ $(ls -rv bedrock_server-* 2> /dev/null|head -1) =~ bedrock_server-(.*) ]]; then
|
||||||
|
VERSION=${BASH_REMATCH[1]}
|
||||||
|
echo "WARN Minecraft download page failed, so using existing download of $VERSION"
|
||||||
|
cat restify.err
|
||||||
|
else
|
||||||
|
if [[ -f restify.err ]]; then
|
||||||
|
echo "Failed to extract download URL '${DOWNLOAD_URL}' from ${downloadPage}"
|
||||||
|
cat restify.err
|
||||||
|
rm restify.err
|
||||||
|
else
|
||||||
|
echo "Failed to lookup download URL: ${DOWNLOAD_URL}"
|
||||||
|
fi
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
rm -f restify.err
|
||||||
|
}
|
||||||
|
|
||||||
if [[ ${DEBUG^^} = TRUE ]]; then
|
if [[ ${DEBUG^^} = TRUE ]]; then
|
||||||
set -x
|
set -x
|
||||||
@@ -45,36 +90,13 @@ case ${VERSION^^} in
|
|||||||
1.18|PREVIOUS)
|
1.18|PREVIOUS)
|
||||||
VERSION=1.18.33.02
|
VERSION=1.18.33.02
|
||||||
;;
|
;;
|
||||||
|
PREVIEW)
|
||||||
|
echo "Looking up latest preview version..."
|
||||||
|
lookupVersion serverBedrockPreviewLinux
|
||||||
|
;;
|
||||||
LATEST)
|
LATEST)
|
||||||
echo "Looking up latest version..."
|
echo "Looking up latest version..."
|
||||||
for i in {1..3}; do
|
lookupVersion serverBedrockLinux
|
||||||
DOWNLOAD_URL=$(restify --user-agent=itzg/minecraft-bedrock-server --headers "accept-language:*" --attribute=data-platform=serverBedrockLinux ${downloadPage} 2> restify.err | jq -r '.[0].href' || echo '')
|
|
||||||
if [[ ${DOWNLOAD_URL} ]]; then
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
if [[ -z ${DOWNLOAD_URL} ]]; then
|
|
||||||
DOWNLOAD_URL=$(curl -s https://mc-bds-helper.vercel.app/api/latest)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${DOWNLOAD_URL} =~ http.*/.*-(.*)\.zip ]]; then
|
|
||||||
VERSION=${BASH_REMATCH[1]}
|
|
||||||
elif [[ $(ls -rv bedrock_server-* 2> /dev/null|head -1) =~ bedrock_server-(.*) ]]; then
|
|
||||||
VERSION=${BASH_REMATCH[1]}
|
|
||||||
echo "WARN Minecraft download page failed, so using existing download of $VERSION"
|
|
||||||
cat restify.err
|
|
||||||
else
|
|
||||||
if [[ -f restify.err ]]; then
|
|
||||||
echo "Failed to extract download URL '${DOWNLOAD_URL}' from ${downloadPage}"
|
|
||||||
cat restify.err
|
|
||||||
rm restify.err
|
|
||||||
else
|
|
||||||
echo "Failed to lookup download URL: ${DOWNLOAD_URL}"
|
|
||||||
fi
|
|
||||||
exit 2
|
|
||||||
fi
|
|
||||||
rm -f restify.err
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# use the given version exactly
|
# use the given version exactly
|
||||||
@@ -84,14 +106,18 @@ esac
|
|||||||
if [ ! -f "bedrock_server-${VERSION}" ]; then
|
if [ ! -f "bedrock_server-${VERSION}" ]; then
|
||||||
|
|
||||||
if [[ ! ${DOWNLOAD_URL} ]]; then
|
if [[ ! ${DOWNLOAD_URL} ]]; then
|
||||||
DOWNLOAD_URL=https://minecraft.azureedge.net/bin-linux/bedrock-server-${VERSION}.zip
|
binPath=bin-linux
|
||||||
|
if isTrue "${PREVIEW}"; then
|
||||||
|
binPath=bin-linux-preview
|
||||||
|
fi
|
||||||
|
DOWNLOAD_URL="https://minecraft.azureedge.net/${binPath}/bedrock-server-${VERSION}.zip"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ $TMP_DIR != /tmp ]] && mkdir -p "$TMP_DIR"
|
[[ $TMP_DIR != /tmp ]] && mkdir -p "$TMP_DIR"
|
||||||
TMP_ZIP="$TMP_DIR/$(basename "${DOWNLOAD_URL}")"
|
TMP_ZIP="$TMP_DIR/$(basename "${DOWNLOAD_URL}")"
|
||||||
|
|
||||||
echo "Downloading Bedrock server version ${VERSION} ..."
|
echo "Downloading Bedrock server version ${VERSION} ..."
|
||||||
if ! curl "${curlArgs[@]}" -o ${TMP_ZIP} -fsSL ${DOWNLOAD_URL}; then
|
if ! curl "${curlArgs[@]}" -o "${TMP_ZIP}" -fsSL ${DOWNLOAD_URL}; then
|
||||||
echo "ERROR failed to download from ${DOWNLOAD_URL}"
|
echo "ERROR failed to download from ${DOWNLOAD_URL}"
|
||||||
echo " Double check that the given VERSION is valid"
|
echo " Double check that the given VERSION is valid"
|
||||||
exit 2
|
exit 2
|
||||||
|
|||||||
Reference in new issue
Block a user