The Unified and Autonomous Development Platform
Remove checkout as root logic due to some other problems are introduced
Robin Shencccf9aad38f8
diff --git a/pom.xml b/pom.xmlindex db2b784f54..6d13f70f66 100644--- a/pom.xml+++ b/pom.xml@@ -620,7 +620,7 @@</repositories><properties><commons.version>2.7.9</commons.version>- <agent.version>1.7.23</agent.version>+ <agent.version>1.7.24</agent.version><slf4j.version>1.7.36</slf4j.version><logback.version>1.2.11</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex db9c016dc9..ba53dffa9a 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -297,16 +297,9 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaList<Integer> position, boolean useTTY) {// Uninstall symbol links as docker can not process it wellcache.uninstallSymbolinks(hostWorkspace);- Commandline docker = newDocker();- Long uid = null;- if (!SystemUtils.IS_OS_WINDOWS && !Bootstrap.isInDocker()) {- uid = DockerExecutorUtils.getUid();- DockerExecutorUtils.changeOwner(docker, hostWorkspace, 1L);- }containerName = network + "-step-" + stringifyStepPosition(position);try {- docker.clearArgs();- docker = newDocker();+ Commandline docker = newDocker();docker.addArgs("run", "--name=" + containerName, "--network=" + network);if (getCpuLimit() != null)docker.addArgs("--cpus", getCpuLimit());@@ -385,8 +378,6 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDareturn result.getReturnCode();} finally {containerName = null;- if (uid != null)- DockerExecutorUtils.changeOwner(docker, hostWorkspace, uid);cache.installSymbolinks(hostWorkspace);}}