dontstarve使用64位程序

VergilGao · Apr 23, 2022 · 7e09925 · 7e09925
1 parent 0e1f6fb
commit 7e09925
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/dontstarve/Dockerfile b/dontstarve/Dockerfile
@@ -3,12 +3,11 @@ FROM ghcr.io/vergilgao/debian-baseimage
 LABEL maintainer="VergilGao"
 LABEL org.opencontainers.image.source="https://github.com/VergilGao/docker-steamcmd-server"
 
-RUN dpkg --add-architecture i386 && \
-	apt-get update && \
+RUN apt-get update && \
 	apt-get -y install --no-install-recommends \
 		lib32gcc-s1 \
 		lib32stdc++6 \
-		libcurl4-gnutls-dev:i386 \
+		libcurl4-gnutls-dev \
 		screen && \
 	rm -rf /var/lib/apt/lists/*
 

diff --git a/dontstarve/scripts/start-server.sh b/dontstarve/scripts/start-server.sh
@@ -73,7 +73,7 @@ if [ "$file_check" != 0 ]; then
 fi
 
 chmod -R ${DATA_PERM} ${DATA_DIR}
-cd ${SERVER_DIR}/bin
+cd ${SERVER_DIR}/bin64
 
 echo "---Server ready---"
 
@@ -82,14 +82,14 @@ if [ "${CAVES}" == "true" ]; then
     find "${SERVER_DIR}" -name "masterLog.*" -exec rm -f {} \;
     find "${SERVER_DIR}" -name "cavesLog.*" -exec rm -f {} \;
     echo "---Start Server---"
-    screen -S Master -L -Logfile "${SERVER_DIR}/masterLog.0" -d -m "${SERVER_DIR}/bin/dontstarve_dedicated_server_nullrenderer" -cluster "${CLUSTER_NAME}" -shard Master
-    screen -S Caves -L -Logfile "${SERVER_DIR}/cavesLog.0" -d -m "${SERVER_DIR}/bin/dontstarve_dedicated_server_nullrenderer" -cluster "${CLUSTER_NAME}" -shard Caves
+    screen -S Master -L -Logfile "${SERVER_DIR}/masterLog.0" -d -m "${SERVER_DIR}/bin64/dontstarve_dedicated_server_nullrenderer_x64" -cluster "${CLUSTER_NAME}" -shard Master
+    screen -S Caves -L -Logfile "${SERVER_DIR}/cavesLog.0" -d -m "${SERVER_DIR}/bin64/dontstarve_dedicated_server_nullrenderer_x64" -cluster "${CLUSTER_NAME}" -shard Caves
     sleep 2
     screen -S watchdog -d -m /opt/scripts/start-watchdog.sh
     tail -f "${SERVER_DIR}/masterLog.0" "${SERVER_DIR}/cavesLog.0"
 else
     find "${SERVER_DIR}" -name "masterLog.*" -exec rm -f {} \;
     find "${SERVER_DIR}" -name "cavesLog.*" -exec rm -f {} \;
     echo "---Start Server---"
-    "${SERVER_DIR}/bin/dontstarve_dedicated_server_nullrenderer" -cluster "${CLUSTER_NAME}" -shard Master
+    "${SERVER_DIR}/bin64/dontstarve_dedicated_server_nullrenderer_x64" -cluster "${CLUSTER_NAME}" -shard Master
 fi
diff --git a/dontstarve/scripts/start-watchdog.sh b/dontstarve/scripts/start-watchdog.sh
@@ -2,7 +2,7 @@
 
 source /opt/scripts/env.sh
 
-killpid="$(pidof dontstarve_dedicated_server_nullrenderer)"
+killpid="$(pidof dontstarve_dedicated_server_nullrenderer_x64)"
 while true
 do
 	tail --pid=${killpid%% *} --pid=${killpid##* } -f /dev/null