Auto-merging via docker-versions-create

This commit is contained in:
Geoff Bourne
2021-11-13 18:53:18 -06:00
2 changed files with 10 additions and 4 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# shellcheck source=../start-utils # shellcheck source=../scripts/start-utils
. ${SCRIPTS:-/}start-utils . "${SCRIPTS:-/}start-utils"
if isTrue "${DISABLE_HEALTHCHECK}"; then if isTrue "${DISABLE_HEALTHCHECK}"; then
echo "Healthcheck disabled" echo "Healthcheck disabled"
@@ -10,6 +10,6 @@ elif isTrue "${ENABLE_AUTOPAUSE}" && [[ "$( ps -ax -o stat,comm | grep 'java' |
echo "Java process suspended by Autopause function" echo "Java process suspended by Autopause function"
exit 0 exit 0
else else
mc-monitor status --host localhost --port $SERVER_PORT mc-monitor status --host localhost --port "${SERVER_PORT:-25565}"
exit $? exit $?
fi fi
+7 -1
View File
@@ -1,9 +1,15 @@
#!/bin/bash #!/bin/bash
. ${SCRIPTS:-/}start-utils # shellcheck source=start-utils
. "${SCRIPTS:-/}start-utils"
: "${SERVER_PORT:=25565}"
export SERVER_PORT
log "Autopause functionality enabled" log "Autopause functionality enabled"
isDebugging && set -x
cp /autopause/knockd-config.cfg /tmp/knockd-config.cfg cp /autopause/knockd-config.cfg /tmp/knockd-config.cfg
# update server port to listen to # update server port to listen to