From cafafa68494a07e6eccc2b36105caa540fa4c97c Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 2 Jul 2021 10:45:38 -0500 Subject: [PATCH] Upgraded restify to 1.3.0 to include user-agent header #155 --- Dockerfile | 2 +- bedrock-entry.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2bf71b7..7a6f15a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN easy-add --var version=0.2.1 --var app=entrypoint-demoter --file {{.app}} -- RUN easy-add --var version=0.1.1 --var app=set-property --file {{.app}} --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_linux_${ARCH}.tar.gz -RUN easy-add --var version=1.2.0 --var app=restify --file {{.app}} --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_linux_${ARCH}.tar.gz +RUN easy-add --var version=1.3.0 --var app=restify --file {{.app}} --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_linux_${ARCH}.tar.gz RUN easy-add --var version=0.5.0 --var app=mc-monitor --file {{.app}} --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_linux_${ARCH}.tar.gz diff --git a/bedrock-entry.sh b/bedrock-entry.sh index ce16890..335b435 100755 --- a/bedrock-entry.sh +++ b/bedrock-entry.sh @@ -8,7 +8,7 @@ if [[ ${DEBUG^^} = TRUE ]]; then echo "DEBUG: running as $(id -a) with $(ls -ld /data)" fi -downloadPage=https://www.minecraft.net/en-us/download/server/bedrock/ +downloadPage=https://www.minecraft.net/en-us/download/server/bedrock if [[ ${EULA^^} != TRUE ]]; then echo @@ -40,9 +40,9 @@ case ${VERSION^^} in VERSION=1.16.20.03 ;; LATEST) - for a in data-bi-prtid data-platform; do + for a in data-platform data-bi-prtid; do for i in {1..3}; do - DOWNLOAD_URL=$(restify --attribute=${a}=serverBedrockLinux ${downloadPage} 2> restify.err | jq -r '.[0].href' || echo '') + DOWNLOAD_URL=$(restify --user-agent=itzg/minecraft-bedrock-server --attribute=${a}=serverBedrockLinux ${downloadPage} 2> restify.err | jq -r '.[0].href' || echo '') if [[ ${DOWNLOAD_URL} ]]; then break 2 fi