The Unified and Autonomous Development Platform
Fix a minor bug for docker on Windows
Robin Shen400fabb54a7a
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.javaindex c141122199..2567671737 100644--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java@@ -78,7 +78,7 @@ public abstract class TaskButton extends AjaxButton {String result;try {result = String.format(- "<div class='task-result alert alert-light-success'>%s</div>",+ "<div class='task-result text-break alert alert-light-success'>%s</div>",HtmlEscape.escapeHtml5(runTask(new SimpleLogger() {@Override@@ -99,7 +99,7 @@ public abstract class TaskButton extends AjaxButton {elseresult = "Error " + title;result = String.format(- "<div class='task-result alert alert-light-danger'>%s</div>",+ "<div class='task-result text-break alert alert-light-danger'>%s</div>",HtmlEscape.escapeHtml5(result));}result = StringUtils.replace(result, "\n", "<br>");diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.javaindex 73d968b211..59871703de 100644--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java@@ -579,7 +579,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, VcontainerEntryPoint = "cmd";if (hostHome.get() != null)- containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\%USERHOME%\\onedev\\* C:\\Users\\%USERHOME% > nul && C:\\onedev-build\\job-commands.bat"};+ containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\%USERNAME%\\onedev\\* C:\\Users\\%USERNAME% > nul && C:\\onedev-build\\job-commands.bat"};elsecontainerCommand = new String[] {"/c", "C:\\onedev-build\\job-commands.bat"};