code

src/main/java/org/rcisoft/business/bcode/service/impl/BCodeLxcServiceImpl.java

@@ -72,20 +72,20 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
         Map param = new HashMap<>();
         param.put("lxcName",lxc.getUserId() + "_" + lxc.getSl());
         param.put("lxcPort",port);
-        param.put("lxcPath",lxc.getWorkingDir());
-
         /* config path*/
-        String destPath = global.getPHYSICAL_UPLOAD_SERVER_LOCATION() + File.separator +
+        String destPath = global.getBASE_UPLOAD_SERVER_LOCATION() + File.separator +
                  global.getLxcDockerfilePath() + File.separator + lxc.getUserId()  + File.separator;
+        /*启动路径*/
+        String dockerPath = global.getPHYSICAL_UPLOAD_SERVER_LOCATION() + File.separator +
+                global.getLxcDockerfilePath() + File.separator + lxc.getUserId()  + File.separator;
+        param.put("lxcPath",dockerPath);
         result = freemarkerUtil.generatorFileFromModel(this.getModelProject(lxc.getCode()),destPath
                 ,param);
         if(!result.isSuccess()) {
             result = new CommandResult(ResultCode.FAIL,"容器配置文件有误!",lxc);
             return result;
         }
-        /*启动路径*/
-        String dockerPath = global.getPHYSICAL_UPLOAD_SERVER_LOCATION() + File.separator +
-                global.getLxcDockerfilePath() + File.separator + lxc.getUserId()  + File.separator;
+
         /*2.docker-compose 起容器*/
         log.info("执行路径:{}",dockerPath);
         result = lxcCommand.startOrDownLxc(dockerPath);