From f1903fb6861c77cc6b59a35a8d9a8669317bb661 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Wed, 14 Jul 2021 20:55:30 -0500 Subject: [PATCH] Increased retry count and added delay between each #155 --- Dockerfile | 2 +- bedrock-entry.sh | 6 ++++-- examples/docker-compose.yml | 8 +++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a6f15a..07819fd 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.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=1.4.1 --var app=restify --file {{.app}} --from https://github.com/itzg/{{.app}}/releases/download/v{{.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 335b435..26c7b27 100755 --- a/bedrock-entry.sh +++ b/bedrock-entry.sh @@ -40,12 +40,14 @@ case ${VERSION^^} in VERSION=1.16.20.03 ;; LATEST) - for a in data-platform data-bi-prtid; do - for i in {1..3}; do + echo "Looking up latest version..." + for a in data-platform ; do + for i in {1..5}; do 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 + sleep 1 done done if [[ ${DOWNLOAD_URL} =~ http.*/.*-(.*)\.zip ]]; then diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml index 3210905..1a9221f 100644 --- a/examples/docker-compose.yml +++ b/examples/docker-compose.yml @@ -9,10 +9,16 @@ services: DIFFICULTY: normal ports: - 19132:19132/udp +# - 39132:39132 +# - 39132:39132/udp +# - 39133:39133 +# - 39133:39133/udp volumes: - bds:/data stdin_open: true tty: true + sysctls: + net.ipv4.ip_local_port_range: 39132 39133 volumes: - bds: {} \ No newline at end of file + bds: {}