The Unified and Autonomous Development Platform
fix: JOB_WORKSPACE should be ONEDEV_WORKSPACE in run container step help (#1484)
Robin Shen94979a947f0f
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 2f887f1bc7..99802b4833 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@@ -20,7 +20,7 @@ import java.util.List;import java.util.Map;@Editable(order=150, name="Run Docker Container", description="Run specified docker container. To access files in "- + "job workspace, either use environment variable <tt>JOB_WORKSPACE</tt>, or specify volume mounts. " ++ + "job workspace, either use environment variable <tt>ONEDEV_WORKSPACE</tt>, or specify volume mounts. " +"<b class='text-warning'>Note: </b> this step can only be executed by server docker executor or remote " +"docker executor")public class RunContainerStep extends Step {@@ -45,8 +45,12 @@ public class RunContainerStep extends Step {for (EnvVar var: getEnvVars())envMap.put(var.getName(), var.getValue());Map<String, String> mountMap = new HashMap<>();- for (VolumeMount mount: getVolumeMounts())- mountMap.put(mount.getSourcePath(), mount.getTargetPath());+ for (VolumeMount mount: getVolumeMounts()) {+ var sourcePath = mount.getSourcePath();+ if (sourcePath == null)+ sourcePath = ".";+ mountMap.put(sourcePath, mount.getTargetPath());+ }return new RunContainerFacade(getImage(), null, getArgs(), envMap, getWorkingDir(), mountMap, isUseTTY());}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java b/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.javaindex 11313e676a..2988c3c160 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/VolumeMount.java@@ -20,10 +20,10 @@ public class VolumeMount implements Serializable {private String target;- @Editable(order=100, description="Specify a path relative to job workspace to be used as mount source")+ @Editable(order = 100, placeholder = "Job workspace", description = "Specify a path relative to job workspace " ++ "to be used as mount source. Leave empty to mount job workspace itself")@Interpolative(variableSuggester="suggestVariables")@SafePath- @NotEmptypublic String getSourcePath() {return source;}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 bd5f4e0522..5f82c95820 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@@ -25,8 +25,8 @@ import io.onedev.server.job.JobRunnable;import io.onedev.server.job.ResourceAllocator;import io.onedev.server.model.support.ImageMapping;import io.onedev.server.model.support.administration.jobexecutor.DockerAware;-import io.onedev.server.model.support.administration.jobexecutor.RegistryLogin;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import io.onedev.server.model.support.administration.jobexecutor.RegistryLogin;import io.onedev.server.plugin.executor.serverdocker.ServerDockerExecutor.TestData;import io.onedev.server.terminal.CommandlineShell;import io.onedev.server.terminal.Shell;