Skip to content

The Unified and Autonomous Development Platform

Fix issue #1145 - When running in bare metal mode, cloned source should be owned by root in docker container

Robin Shen15ad390e6a5d
diff --git a/pom.xml b/pom.xml
index 97077e7c4c..db2b784f54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -619,8 +619,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.7.8</commons.version>
- <agent.version>1.7.22</agent.version>
+ <commons.version>2.7.9</commons.version>
+ <agent.version>1.7.23</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.java
index 573408ca29..db9c016dc9 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,9 +297,16 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
List<Integer> position, boolean useTTY) {
// Uninstall symbol links as docker can not process it well
cache.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 {
- Commandline docker = newDocker();
+ docker.clearArgs();
+ docker = newDocker();
docker.addArgs("run", "--name=" + containerName, "--network=" + network);
if (getCpuLimit() != null)
docker.addArgs("--cpus", getCpuLimit());
@@ -378,6 +385,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
return result.getReturnCode();
} finally {
containerName = null;
+ if (uid != null)
+ DockerExecutorUtils.changeOwner(docker, hostWorkspace, uid);
cache.installSymbolinks(hostWorkspace);
}
}
@@ -409,7 +418,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
jobLogger.error("Step \"" + stepNames + "\" is failed: Command exited with code " + exitCode);
return false;
}
- } else if (facade instanceof BuildImageFacade || facade instanceof BuildImageFacade) {
+ } else if (facade instanceof BuildImageFacade) {
DockerExecutorUtils.buildImage(newDocker(), (BuildImageFacade) facade,
hostBuildHome, jobLogger);
} else if (facade instanceof RunContainerFacade) {