Merge pull request #1889 from MCSManager/yumao/fix-bug-1126

yumao233 · web-flow · commit a140b0f018fe · 2025-11-27T16:38:13.000+08:00
fix: #1883
diff --git a/daemon/src/service/docker_process_service.ts b/daemon/src/service/docker_process_service.ts
@@ -14,6 +14,7 @@ import { IInstanceProcess } from "../entity/instance/interface";
 import { $t } from "../i18n";
 import { AsyncTask } from "./async_task_service";
 import logger from "./log";
+import InstanceSubsystem from "./system_instance";
 
 type PublicPortArray = {
   [key: string]: { HostPort: string }[];
@@ -152,8 +153,9 @@ export class SetupDockerContainer extends AsyncTask {
     const workingDir = dockerConfig.workingDir || undefined;
 
     let cwd = instance.absoluteCwdPath();
+    const defaultInstanceDir = InstanceSubsystem.getInstanceDataDir();
     const hostRealPath = toText(process.env.MCSM_DOCKER_WORKSPACE_PATH);
-    if (hostRealPath) {
+    if (hostRealPath && cwd.includes(defaultInstanceDir)) {
       cwd = path.normalize(path.join(hostRealPath, instance.instanceUuid));
     }
 
diff --git a/daemon/src/service/system_instance.ts b/daemon/src/service/system_instance.ts
@@ -16,17 +16,6 @@ import logger from "./log";
 import InstanceControl from "./system_instance_control";
 import takeoverContainer from "./takeover_container";
 
-// init instance default install path
-globalConfiguration.load();
-let INSTANCE_DATA_DIR = path.join(process.cwd(), "data/InstanceData");
-if (globalConfiguration.config.defaultInstancePath) {
-  INSTANCE_DATA_DIR = path.normalize(globalConfiguration.config.defaultInstancePath);
-}
-
-if (!fs.existsSync(INSTANCE_DATA_DIR)) {
-  fs.mkdirsSync(INSTANCE_DATA_DIR);
-}
-
 class InstanceSubsystem extends EventEmitter {
   public readonly GLOBAL_INSTANCE = "__MCSM_GLOBAL_INSTANCE__";
   public readonly GLOBAL_INSTANCE_UUID = "global0001";
@@ -35,9 +24,22 @@ class InstanceSubsystem extends EventEmitter {
 
   public readonly instances = new Map<string, Instance>();
   public readonly instanceStream = new InstanceStreamListener();
+  private instanceDataDir = "";
 
   constructor() {
     super();
+    // init instance default install path
+    globalConfiguration.load();
+    let instanceDataDir = path.join(process.cwd(), "data/InstanceData");
+    if (globalConfiguration.config.defaultInstancePath) {
+      instanceDataDir = path.normalize(globalConfiguration.config.defaultInstancePath);
+    }
+    if (!fs.existsSync(instanceDataDir)) fs.mkdirsSync(instanceDataDir);
+    this.instanceDataDir = path.normalize(instanceDataDir);
+  }
+
+  public getInstanceDataDir() {
+    return this.instanceDataDir;
   }
 
   // start automatically at boot
@@ -153,7 +155,7 @@ class InstanceSubsystem extends EventEmitter {
     const instance = new Instance(newUuid, new InstanceConfig());
     // Instance working directory verification and automatic creation
     if (!cfg.cwd || cfg.cwd === ".") {
-      cfg.cwd = path.normalize(`${INSTANCE_DATA_DIR}/${instance.instanceUuid}`);
+      cfg.cwd = path.normalize(`${this.instanceDataDir}/${instance.instanceUuid}`);
     }
     if (!fs.existsSync(cfg.cwd)) fs.mkdirsSync(cfg.cwd);
     // Set the default input and output encoding
