Add NoScreen environment variable

cyberops7 · Dec 17, 2023 · d91ae83 · d91ae83
1 parent 41cc824
commit d91ae83
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ A popular place to get plugins is: <a href="https://dev.bukkit.org/bukkit-plugin
 <ul>
   <li>August 22nd 2022</li>
     <ul>
-        <li>Attempt to fix screen on Azure instances</li>
+        <li>Add NoScreen environment variable -- thjs disables screen which prevents needing an interactive terminal (but disables some logging)</li>
     </ul>
   <li>August 18th 2022</li>
     <ul>

diff --git a/amd64.Dockerfile b/amd64.Dockerfile
@@ -26,6 +26,9 @@ ENV MaxMemory=
 # Optional Paper Minecraft Version override
 ENV Version="1.19.2"
 
+# Optional switch to prevent usage of screen (disables logging but may fix container launch issues on some platforms)
+ENV NoScreen=
+
 # IPV4 Ports
 EXPOSE 25565/tcp
 EXPOSE 19132/tcp

diff --git a/arm64v8.Dockerfile b/arm64v8.Dockerfile
@@ -29,6 +29,9 @@ ENV MaxMemory=
 # Optional Paper Minecraft Version override
 ENV Version="1.19.2"
 
+# Optional switch to prevent usage of screen (disables logging but may fix container launch issues on some platforms)
+ENV NoScreen=
+
 # IPV4 Ports
 EXPOSE 25565/tcp
 EXPOSE 19132/tcp

diff --git a/armv7.Dockerfile b/armv7.Dockerfile
@@ -29,6 +29,9 @@ ENV MaxMemory=
 # Optional Paper Minecraft Version override
 ENV Version="1.19.2"
 
+# Optional switch to prevent usage of screen (disables logging but may fix container launch issues on some platforms)
+ENV NoScreen=
+
 # IPV4 Ports
 EXPOSE 25565/tcp
 EXPOSE 19132/tcp

diff --git a/ppc64le.Dockerfile b/ppc64le.Dockerfile
@@ -29,6 +29,9 @@ ENV MaxMemory=
 # Optional Paper Minecraft Version override
 ENV Version="1.19.2"
 
+# Optional switch to prevent usage of screen (disables logging but may fix container launch issues on some platforms)
+ENV NoScreen=
+
 # IPV4 Ports
 EXPOSE 25565/tcp
 EXPOSE 19132/tcp

diff --git a/s390x.Dockerfile b/s390x.Dockerfile
@@ -29,6 +29,9 @@ ENV MaxMemory=
 # Optional Paper Minecraft Version override
 ENV Version="1.19.2"
 
+# Optional switch to prevent usage of screen (disables logging but may fix container launch issues on some platforms)
+ENV NoScreen=
+
 # IPV4 Ports
 EXPOSE 25565/tcp
 EXPOSE 19132/tcp

diff --git a/start.sh b/start.sh
@@ -172,9 +172,16 @@ fi
 # Start server
 echo "Starting Minecraft server..."
 
-script /dev/null
 if [[ -z "$MaxMemory" ]] || [[ "$MaxMemory" -le 0 ]]; then
-    screen -L -Logfile /minecraft/logs/minecraft.$(date +%Y.%m.%d.%H.%M.%S).log -mS minecraft /jre/bin/java -XX:+UnlockDiagnosticVMOptions -XX:-UseAESCTRIntrinsics -DPaper.IgnoreJavaVersion=true -Xms400M -jar /minecraft/paperclip.jar
+    if [ -z "$NoScreen" ]; then
+        screen -L -Logfile /minecraft/logs/minecraft.$(date +%Y.%m.%d.%H.%M.%S).log -mS minecraft /jre/bin/java -XX:+UnlockDiagnosticVMOptions -XX:-UseAESCTRIntrinsics -DPaper.IgnoreJavaVersion=true -Xms400M -jar /minecraft/paperclip.jar
+    else
+        /jre/bin/java -XX:+UnlockDiagnosticVMOptions -XX:-UseAESCTRIntrinsics -DPaper.IgnoreJavaVersion=true -Xms400M -jar /minecraft/paperclip.jar
+    fi
 else
-    screen -L -Logfile /minecraft/logs/minecraft.$(date +%Y.%m.%d.%H.%M.%S).log -mS minecraft /jre/bin/java -XX:+UnlockDiagnosticVMOptions -XX:-UseAESCTRIntrinsics -DPaper.IgnoreJavaVersion=true -Xms400M -Xmx${MaxMemory}M -jar /minecraft/paperclip.jar
+    if [ -z "$NoScreen" ]; then
+        screen -L -Logfile /minecraft/logs/minecraft.$(date +%Y.%m.%d.%H.%M.%S).log -mS minecraft /jre/bin/java -XX:+UnlockDiagnosticVMOptions -XX:-UseAESCTRIntrinsics -DPaper.IgnoreJavaVersion=true -Xms400M -Xmx${MaxMemory}M -jar /minecraft/paperclip.jar
+    else
+        /jre/bin/java -XX:+UnlockDiagnosticVMOptions -XX:-UseAESCTRIntrinsics -DPaper.IgnoreJavaVersion=true -Xms400M -Xmx${MaxMemory}M -jar /minecraft/paperclip.jar
+    fi
 fi