From 6465bca640d21795405a356a262f5a246e12f121 Mon Sep 17 00:00:00 2001 From: Alexei Date: Wed, 1 Apr 2020 16:49:21 +0200 Subject: [PATCH 1/3] Checking health of the container using SERVER_IP variable (#473) --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c1d05f9c..c9f62e7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN apk add --no-cache -U \ rsync \ nano -HEALTHCHECK --start-period=1m CMD mc-monitor status --host localhost --port $SERVER_PORT +HEALTHCHECK --start-period=1m CMD mc-monitor status --host $SERVER_IP --port $SERVER_PORT RUN addgroup -g 1000 minecraft \ && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \ @@ -70,7 +70,7 @@ ENV UID=1000 GID=1000 \ TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \ PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \ RESOURCE_PACK= RESOURCE_PACK_SHA1= \ - LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true SERVER_NAME="Dedicated Server" \ + LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_IP='localhost' SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true SERVER_NAME="Dedicated Server" \ REPLACE_ENV_VARIABLES="FALSE" ENV_VARIABLE_PREFIX="CFG_" COPY start* / From 98f0b36cfccc3553fd3adcbbe1d382a2a5387391 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Wed, 1 Apr 2020 18:50:07 -0500 Subject: [PATCH 2/3] Changed FTB exec to always use shell For #469 --- start-minecraftFinalSetup | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup index 9d2aa093..7badb723 100644 --- a/start-minecraftFinalSetup +++ b/start-minecraftFinalSetup @@ -99,6 +99,8 @@ fi mcServerRunnerArgs="--stop-duration 60s" if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then + mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash" + if [ ! -e "${FTB_DIR}/ops.json" -a -e /data/ops.txt ]; then cp -f /data/ops.txt ${FTB_DIR}/ fi @@ -119,10 +121,6 @@ EOF if [ -f "${FTB_DIR}/settings.cfg" ]; then sed -i "s/MAX_RAM=[^;]*/MAX_RAM=${MAX_MEMORY}/" "${FTB_DIR}/settings.cfg" fi - # if missing shebang line, then run file through bash - if ! head -1 "${FTB_SERVER_START}"|grep -q "^#!"; then - mcServerRunnerArgs="${mcServerRunnerArgs} --shell bash" - fi cd "${FTB_DIR}" log "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..." From d131941b627418b72586474fbc92b6017d127657 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Thu, 2 Apr 2020 10:14:22 -0500 Subject: [PATCH 3/3] Revert "Checking health of the container using SERVER_IP variable (#473)" This reverts commit 6465bca6 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9f62e7f..c1d05f9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN apk add --no-cache -U \ rsync \ nano -HEALTHCHECK --start-period=1m CMD mc-monitor status --host $SERVER_IP --port $SERVER_PORT +HEALTHCHECK --start-period=1m CMD mc-monitor status --host localhost --port $SERVER_PORT RUN addgroup -g 1000 minecraft \ && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \ @@ -70,7 +70,7 @@ ENV UID=1000 GID=1000 \ TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \ PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \ RESOURCE_PACK= RESOURCE_PACK_SHA1= \ - LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_IP='localhost' SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true SERVER_NAME="Dedicated Server" \ + LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true SERVER_NAME="Dedicated Server" \ REPLACE_ENV_VARIABLES="FALSE" ENV_VARIABLE_PREFIX="CFG_" COPY start* /