The Unified and Autonomous Development Platform
fix: Chown not successful on agent running in docker
Robin Shen07e410aaa513
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.javaindex b0a7a1c0e0..ab1b11e73b 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultAgentService.java@@ -243,10 +243,6 @@ public class DefaultAgentService extends BaseEntityService<Agent> implements AgeQuery<?> query = getSession().createQuery("update Build set agent=null where agent=:agent");query.setParameter("agent", agent);query.executeUpdate();-- query = getSession().createQuery("update Workspace set agent=null where agent=:agent");- query.setParameter("agent", agent);- query.executeUpdate();}@Sessionaldiff --git a/server-ee b/server-eeindex 035502490c..154cb834d8 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 035502490cc45295ada984a61f4a01f7accae3a9+Subproject commit 154cb834d869fb4c5e90b84186bfcc6f7e8c3318diff --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 269ff7bc4b..741a53051d 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@@ -440,7 +440,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Tevar runAs = commandFacade.getRunAs();if (SystemUtils.IS_OS_LINUX && !runAs.equals("0:0")) {jobLogger.log("Changing owner of build directory to container user...");- changeOwner(docker, runAs, hostBuildDir, jobLogger);+ changeOwner(docker, runAs, hostBuildDir, osIds, jobLogger);}try {int exitCode = callWithRegistryLogins(docker, registryLogins, () -> {@@ -456,7 +456,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Te} finally {if (SystemUtils.IS_OS_LINUX && !osIds.equals("0:0")) {jobLogger.log("Changing owner of build directory to host user...");- changeOwner(newDocker(), osIds, hostBuildDir, jobLogger);+ changeOwner(newDocker(), osIds, hostBuildDir, osIds, jobLogger);}}} else if (facade instanceof BuildImageFacade) {@@ -496,7 +496,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Tevar runAs = runContainerFacade.getRunAs() != null ? runContainerFacade.getRunAs() : "0:0";if (SystemUtils.IS_OS_LINUX && !runAs.equals("0:0")) {jobLogger.log("Changing owner of build directory to container user...");- changeOwner(docker, runAs, hostBuildDir, jobLogger);+ changeOwner(docker, runAs, hostBuildDir, osIds, jobLogger);}try {int exitCode = callWithRegistryLogins(docker, registryLogins, () -> {@@ -511,7 +511,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Te} finally {if (SystemUtils.IS_OS_LINUX && !osIds.equals("0:0")) {jobLogger.log("Changing owner of build directory to host user...");- changeOwner(newDocker(), osIds, hostBuildDir, jobLogger);+ changeOwner(newDocker(), osIds, hostBuildDir, osIds, jobLogger);}}} else if (facade instanceof CheckoutFacade) {