The Unified and Autonomous Development Platform
Fix issue #634 - Run container step should not mount job workspace as specified working directory
Robin Shen67f39a50be56
diff --git a/pom.xml b/pom.xmlindex 6fac1b0075..ac09a14d47 100644--- a/pom.xml+++ b/pom.xml@@ -559,7 +559,7 @@</repositories><properties><commons.version>2.1.0</commons.version>- <agent.version>1.2.12</agent.version>+ <agent.version>1.2.13</agent.version><slf4j.version>1.7.30</slf4j.version><logback.version>1.2.0</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 5e4a2385f4..debd31e2a6 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -103,7 +103,7 @@ public class Job implements NamedElement, Serializable, Validatable {private List<CacheSpec> caches = new ArrayList<>();- private int cpuRequirement = 500;+ private int cpuRequirement = 250;private int memoryRequirement = 256;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.javaindex 7217deb904..3d843c47cb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunContainerStep.java@@ -43,7 +43,7 @@ public class RunContainerStep extends Step {}@Editable(order=100, description="Specify container image to run. <b class='text-warning'>NOTE:</b> A shell must "- + "exist in the container if the step is executed by kubernetes executor, as OneDev intercepts the "+ + "exist in the container if the step is executed by kubernetes executor, as OneDev needs to intercept the "+ "entrypoint to make step containers executing sequentially in the pod")@Interpolative(variableSuggester="suggestVariables")@NotEmpty@@ -66,10 +66,7 @@ public class RunContainerStep extends Step {this.args = args;}- @Editable(order=200, name="Working Directory", description="Optionally specify working directory of the container. "- + "Leave empty to use the default working directory. "- + "<a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>Job workspace</a> will be "- + "mounted to the working directory so that the container can access job files")+ @Editable(order=200, name="Working Directory", description="Optionally specify working directory of the container")@Nullablepublic String getWorkingDir() {return workingDir;diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex 7f3bf7b8c8..8f338f5796 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -716,8 +716,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataString trustCertsHome;String dockerSock;String containerdSock;+ String containerWorkspace;if (osInfo.isWindows()) {containerBuildHome = "C:\\onedev-build";+ containerWorkspace = containerBuildHome + "\\workspace";containerCacheHome = containerBuildHome + "\\cache";containerCommandHome = containerBuildHome + "\\command";containerAuthInfoHome = "C:\\Users\\ContainerAdministrator\\auth-info";@@ -726,6 +728,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatacontainerdSock = "\\\\.\\pipe\\containerd-containerd";} else {containerBuildHome = "/onedev-build";+ containerWorkspace = containerBuildHome +"/workspace";containerCacheHome = containerBuildHome + "/cache";containerCommandHome = containerBuildHome + "/command";containerAuthInfoHome = "/root/auth-info";@@ -804,6 +807,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData"name", ENV_OS_INFO,"value", Hex.encodeHexString(SerializationUtils.serialize(osInfo))));+ commonEnvs.add(CollectionUtils.newLinkedHashMap(+ "name", "ONEDEV_WORKSPACE",+ "value", containerWorkspace+ ));entryFacade.traverse(new LeafVisitor<Void>() {@@ -841,14 +848,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData"image", container.getImage());if (runContainerFacade.isUseTTY())stepContainerSpec.put("tty", true);- List<Object> volumeMounts = new ArrayList<>(commonVolumeMounts);- if (container.getWorkingDir() != null) {- volumeMounts.add(CollectionUtils.newLinkedHashMap(- "name", "build-home",- "mountPath", container.getWorkingDir(),- "subPath", "workspace"));- }- stepContainerSpec.put("volumeMounts", volumeMounts);+ stepContainerSpec.put("volumeMounts", commonVolumeMounts);List<Map<Object, Object>> envs = new ArrayList<>(commonEnvs);for (Map.Entry<String, String> entry: container.getEnvMap().entrySet()) {envs.add(CollectionUtils.newLinkedHashMap(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 387507dd78..294b8561c2 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@@ -223,12 +223,12 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDadocker.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));docker.addArgs("-v", getHostPath(hostBuildHome.getAbsolutePath()) + ":" + containerBuildHome);- if (workingDir != null) {- docker.addArgs("-v", getHostPath(hostWorkspace.getAbsolutePath()) + ":" + workingDir);- docker.addArgs("-w", workingDir);- } else {++ if (entrypoint != null)docker.addArgs("-w", containerWorkspace);- }+ else if (workingDir != null)+ docker.addArgs("-w", workingDir);+for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {if (!PathUtils.isCurrent(entry.getValue())) {String hostCachePath = entry.getKey().getDirectory(hostCacheHome).getAbsolutePath();@@ -256,6 +256,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDafor (Map.Entry<String, String> entry: environments.entrySet())docker.addArgs("-e", entry.getKey() + "=" + entry.getValue());++ docker.addArgs("-e", "ONEDEV_WORKSPACE=" + containerWorkspace);if (useTTY)docker.addArgs("-t");