The Unified and Autonomous Development Platform
Add bash and powershell command step
Robin Shen9e87a7694467
diff --git a/doc/incompatibilities.md b/doc/incompatibilities.mdindex 7e636d8556..5b386032e3 100644--- a/doc/incompatibilities.md+++ b/doc/incompatibilities.md@@ -1,3 +1,8 @@+# 6.2.0++1. A new property `Run In Container` is added and enabled for all command steps in build spec. If you have steps intended to+be executed by shell executor, edit it to disable this property, otherwise the build will fail reporting `This step should be executed by server docker executor, remote docker executor, or kubernetes executor`+# 5.4.01. In case install OneDev into a Kubernetes cluster, Kustomization based deployment is replaced by helm based deployment for flexibility reasondiff --git a/pom.xml b/pom.xmlindex dc9c8c1545..af363ed4c0 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.0.5</version></parent><artifactId>server</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -564,7 +564,7 @@</repositories><properties><commons.version>2.0.20</commons.version>- <agent.version>1.1.8</agent.version>+ <agent.version>1.2.0</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/pom.xml b/server-core/pom.xmlindex 838bd7cf1d..82d17d0a51 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.javaindex 4fba38b170..2c38ebea98 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java@@ -1216,4 +1216,50 @@ public class BuildSpec implements Serializable, Validatable {}}+ @SuppressWarnings("unused")+ private void migrate14(VersionedYamlDoc doc, Stack<Integer> versions) {+ for (NodeTuple specTuple: doc.getValue()) {+ String specObjectKey = ((ScalarNode)specTuple.getKeyNode()).getValue();+ if (specObjectKey.equals("jobs")) {+ SequenceNode jobsNode = (SequenceNode) specTuple.getValueNode();+ for (Node jobsNodeItem: jobsNode.getValue()) {+ MappingNode jobNode = (MappingNode) jobsNodeItem;+ for (NodeTuple jobTuple: jobNode.getValue()) {+ String jobTupleKey = ((ScalarNode)jobTuple.getKeyNode()).getValue();+ if (jobTupleKey.equals("steps")) {+ SequenceNode stepsNode = (SequenceNode) jobTuple.getValueNode();+ for (Node stepsNodeItem: stepsNode.getValue()) {+ MappingNode stepNode = (MappingNode) stepsNodeItem;+ if (stepNode.getTag().getValue().equals("!CommandStep")) {+ stepNode.getValue().add(new NodeTuple(+ new ScalarNode(Tag.STR, "runInContainer"),+ new ScalarNode(Tag.BOOL, "true")));+ }+ }+ }+ }+ }+ } else if (specObjectKey.equals("stepTemplates")) {+ SequenceNode stepTemplatesNode = (SequenceNode) specTuple.getValueNode();+ for (Node stepTemplatesNodeItem: stepTemplatesNode.getValue()) {+ MappingNode stepTemplateNode = (MappingNode) stepTemplatesNodeItem;+ for (NodeTuple stepTemplateTuple: stepTemplateNode.getValue()) {+ String stepTemplateTupleKey = ((ScalarNode)stepTemplateTuple.getKeyNode()).getValue();+ if (stepTemplateTupleKey.equals("steps")) {+ SequenceNode stepsNode = (SequenceNode) stepTemplateTuple.getValueNode();+ for (Node stepsNodeItem: stepsNode.getValue()) {+ MappingNode stepNode = (MappingNode) stepsNodeItem;+ if (stepNode.getTag().getValue().equals("!CommandStep")) {+ stepNode.getValue().add(new NodeTuple(+ new ScalarNode(Tag.STR, "runInContainer"),+ new ScalarNode(Tag.BOOL, "true")));+ }+ }+ }+ }+ }+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BorneShellStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BorneShellStep.javanew file mode 100644index 0000000000..b9252e4cec--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BorneShellStep.java@@ -0,0 +1,39 @@+package io.onedev.server.buildspec.step;++import java.util.List;++import javax.validation.constraints.Size;++import io.onedev.k8shelper.BorneShellExecutable;+import io.onedev.k8shelper.Executable;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.model.Build;+import io.onedev.server.util.validation.annotation.Code;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;++@Editable(order=14, name="Execute Borne Shell Commands")+public class BorneShellStep extends CommandStep {++ private static final long serialVersionUID = 1L;++ @Editable(order=110, description="Specify borne shell commands to execute "+ + "under the <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. Depending on the "+ + "job executor being used, this may be executed either inside or outside container")+ @Interpolative+ @Code(language=Code.SHELL, variableProvider="suggestVariables")+ @Size(min=1, message="may not be empty")+ public List<String> getCommands() {+ return super.getCommands();+ }++ public void setCommands(List<String> commands) {+ super.setCommands(commands);+ }++ @Override+ public Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {+ return new BorneShellExecutable(getImage(), getCommands(), isUseTTY());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.javaindex d927dde0c7..9fb571eae0 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java@@ -13,23 +13,41 @@ import io.onedev.k8shelper.Executable;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.param.ParamCombination;import io.onedev.server.model.Build;+import io.onedev.server.util.EditContext;import io.onedev.server.util.validation.annotation.Code;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;+import io.onedev.server.web.editable.annotation.ShowCondition;@Editable(order=10, name="Execute Shell/Batch Commands")public class CommandStep extends Step {private static final long serialVersionUID = 1L;+ private boolean runInContainer = true;+private String image;private List<String> commands = new ArrayList<>();private boolean useTTY;- @Editable(order=100, description="Specify docker image to execute commands inside. "- + "<span class='text-warning'>This property will be ignored if the job is executed by a shell executor</span>")+ @Editable(order=50, description="Whether or not to run this step inside container")+ public boolean isRunInContainer() {+ return runInContainer;+ }++ public void setRunInContainer(boolean runInContainer) {+ this.runInContainer = runInContainer;+ }++ @SuppressWarnings("unused")+ private static boolean isRunInContainerEnabled() {+ return (boolean) EditContext.get().getInputValue("runInContainer");+ }++ @Editable(order=100, description="Specify container image to execute commands inside")+ @ShowCondition("isRunInContainerEnabled")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getImage() {@@ -40,11 +58,11 @@ public class CommandStep extends Step {this.image = image;}- @Editable(order=110, description="Specify content of Linux shell script or Windows command batch to execute "+ @Editable(order=110, description="Specify shell (on Linux/Unix) or batch (on Windows) commands to execute "+ "under the <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. Depending on the "+ "job executor being used, this may be executed either inside or outside container")@Interpolative- @Code(language=Code.SHELL, variableProvider="suggestCommandVariables")+ @Code(language=Code.SHELL, variableProvider="suggestVariables")@Size(min=1, message="may not be empty")public List<String> getCommands() {return commands;@@ -67,19 +85,13 @@ public class CommandStep extends Step {this.useTTY = useTTY;}- @SuppressWarnings("unused")- private static List<InputSuggestion> suggestVariables(String matchWith) {+ static List<InputSuggestion> suggestVariables(String matchWith) {return BuildSpec.suggestVariables(matchWith, false, false);}- @SuppressWarnings("unused")- private static List<InputSuggestion> suggestCommandVariables(String matchWith) {- return BuildSpec.suggestVariables(matchWith, true, true);- }-@Overridepublic Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {- return new CommandExecutable(getImage(), getCommands(), isUseTTY());+ return new CommandExecutable(runInContainer?getImage():null, getCommands(), isUseTTY());}}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PowerShellStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PowerShellStep.javanew file mode 100644index 0000000000..9c46618fd7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PowerShellStep.java@@ -0,0 +1,43 @@+package io.onedev.server.buildspec.step;++import java.util.List;++import javax.validation.constraints.Size;++import io.onedev.k8shelper.Executable;+import io.onedev.k8shelper.PowerShellExecutable;+import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.model.Build;+import io.onedev.server.util.validation.annotation.Code;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Interpolative;++@Editable(order=17, name="Execute PowerShell Commands")+public class PowerShellStep extends CommandStep {++ private static final long serialVersionUID = 1L;++ @Editable(order=110, description="Specify PowerShell commands to execute "+ + "under the <a href='$docRoot/pages/concepts.md#job-workspace' target='_blank'>job workspace</a>. Depending on the "+ + "job executor being used, this may be executed either inside or outside container.<br>"+ + "<b class='text-danger'>NOTE: </b> OneDev checks exit code of the script to determine if step is successful. "+ + "Since PowerShell always exit with 0 even if there are script errors, you should handle errors in the script "+ + "and exit with non-zero code, or simply add line <code>$ErrorActionPreference = \"Stop\"</code> at start of "+ + "your script<br>")+ @Interpolative+ @Code(language=Code.POWER_SHELL, variableProvider="suggestVariables")+ @Size(min=1, message="may not be empty")+ public List<String> getCommands() {+ return super.getCommands();+ }++ public void setCommands(List<String> commands) {+ super.setCommands(commands);+ }++ @Override+ public Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {+ return new PowerShellExecutable(getImage(), getCommands(), isUseTTY());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/Code.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/Code.javaindex 7408a6b1f5..7bb127e32c 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/annotation/Code.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/Code.java@@ -27,6 +27,8 @@ public @interface Code {String SHELL = "Shell";+ String POWER_SHELL = "PowerShell";+String HTML_TEMPLATE = "Java Server Pages";String language();diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/powershell/powershell.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/powershell/powershell.jsindex c443e7232d..97b022c06f 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/powershell/powershell.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/mode/powershell/powershell.js@@ -222,13 +222,11 @@ CodeMirror.defineMode('powershell', function() {state.tokenize = tokenMultiString;state.startQuote = quoteMatch[0];return tokenMultiString(stream, state);- } else if (stream.peek().match(/[({]/)) {+ } else {return 'punctuation';- } else if (stream.peek().match(varNames)) {- // splatted variable- return tokenVariable(stream, state);}}+return 'error';}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.javaindex f2af90f2bb..634ee545ff 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java@@ -83,9 +83,13 @@ public class EditableUtils {} else if (element.getAnnotation(Interpolative.class) != null) {String description = getDescription(element, editable);if (description.length() != 0) {- if (!description.endsWith("."))- description += ".";- description += " " + VariableInterpolator.HELP;+ if (description.endsWith("<br>")) {+ description += VariableInterpolator.HELP;+ } else {+ if (!description.endsWith("."))+ description += ".";+ description += " " + VariableInterpolator.HELP;+ }} else {description = VariableInterpolator.HELP;}diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex a074b3d2bd..c8b1ccddb4 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 1128e17f23..6c55e64476 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex ad6dc184ca..5e25a81617 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex 53ec039cc0..5ca0f65397 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex bc6e6908ff..1483bda408 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex d8e5cf8e27..55e7123e2c 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex ecd44e8af8..de905ff817 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>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 f9a9221848..77a193b926 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@@ -785,9 +785,15 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatacontainerNames.add(containerName);Map<Object, Object> stepContainerSpec;if (executable instanceof CommandExecutable) {+ CommandExecutable commandExecutable = (CommandExecutable) executable;+ if (commandExecutable.getImage() == null) {+ throw new ExplicitException("This step should be executed by server shell "+ + "executor or remote shell executor");+ }+stepContainerSpec = CollectionUtils.newHashMap("name", containerName,- "image", ((CommandExecutable)executable).getImage());+ "image", commandExecutable.getImage());if (((CommandExecutable) executable).isUseTTY())stepContainerSpec.put("tty", true);} else {diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex 921cda4a48..8717fcfa3f 100644--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex 20429cf959..7eddf4411b 100644--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex c30081a564..999a3a20d9 100644--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>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 d96f9e6680..695d48b874 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@@ -211,15 +211,12 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaString containerBuildHome;String containerWorkspace;- String containerEntryPoint;if (SystemUtils.IS_OS_WINDOWS) {containerBuildHome = "C:\\onedev-build";containerWorkspace = "C:\\onedev-build\\workspace";- containerEntryPoint = "cmd";} else {containerBuildHome = "/onedev-build";containerWorkspace = "/onedev-build/workspace";- containerEntryPoint = "sh";}jobContext.reportJobWorkspace(containerWorkspace);@@ -234,37 +231,15 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaif (executable instanceof CommandExecutable) {CommandExecutable commandExecutable = (CommandExecutable) executable;- String[] containerCommand;- if (SystemUtils.IS_OS_WINDOWS) {- if (hostAuthInfoHome.get() != null)- containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\%USERNAME%\\auth-info\\* C:\\Users\\%USERNAME% > nul && C:\\onedev-build\\job-commands.bat"};- else- containerCommand = new String[] {"/c", "C:\\onedev-build\\job-commands.bat"};- File scriptFile = new File(hostBuildHome, "job-commands.bat");- try {- FileUtils.writeLines(- scriptFile,- new ArrayList<>(replacePlaceholders(commandExecutable.getCommands(), hostBuildHome)),- "\r\n");- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- if (hostAuthInfoHome.get() != null)- containerCommand = new String[] {"-c", "cp -r -f -p /root/auth-info/. /root && sh /onedev-build/job-commands.sh"};- else- containerCommand = new String[] {"/onedev-build/job-commands.sh"};- File scriptFile = new File(hostBuildHome, "job-commands.sh");- try {- FileUtils.writeLines(- scriptFile,- new ArrayList<>(replacePlaceholders(commandExecutable.getCommands(), hostBuildHome)),- "\n");- } catch (IOException e) {- throw new RuntimeException(e);- }++ if (commandExecutable.getImage() == null) {+ throw new ExplicitException("This step should be executed by server shell "+ + "executor or remote shell executor");}+ Commandline entrypoint = DockerExecutorUtils.getEntrypoint(+ hostBuildHome, commandExecutable, hostAuthInfoHome.get() != null);+String containerName = network + "-step-" + stringifyPosition(position);Commandline docker = newDocker();docker.clearArgs();@@ -298,10 +273,10 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaif (commandExecutable.isUseTTY())docker.addArgs("-t");- docker.addArgs("-w", containerWorkspace, "--entrypoint=" + containerEntryPoint);+ docker.addArgs("-w", containerWorkspace, "--entrypoint=" + entrypoint.executable());docker.addArgs(commandExecutable.getImage());- docker.addArgs(containerCommand);+ docker.addArgs(entrypoint.arguments().toArray(new String[0]));ProcessKiller killer = newDockerKiller(newDocker(), containerName, jobLogger);ExecutionResult result = docker.execute(newInfoLogger(jobLogger), newErrorLogger(jobLogger), null, killer);diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xmlindex 3ce76545b6..34b7799ef6 100644--- a/server-plugin/server-plugin-executor-servershell/pom.xml+++ b/server-plugin/server-plugin-executor-servershell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex c33f8a7be4..b96658edf7 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -1,6 +1,5 @@package io.onedev.server.plugin.executor.servershell;-import static io.onedev.agent.ShellExecutorUtils.getShell;import static io.onedev.agent.ShellExecutorUtils.newErrorLogger;import static io.onedev.agent.ShellExecutorUtils.newInfoLogger;import static io.onedev.agent.ShellExecutorUtils.resolveCachePath;@@ -27,8 +26,6 @@ import java.util.function.Consumer;import javax.validation.constraints.Size;-import org.apache.commons.lang.SystemUtils;-import io.onedev.agent.job.FailedException;import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AppLoader;@@ -147,27 +144,19 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatif (executable instanceof CommandExecutable) {CommandExecutable commandExecutable = (CommandExecutable) executable;- File jobScriptFile;- if (SystemUtils.IS_OS_WINDOWS) {- jobScriptFile = new File(buildDir, "job-commands.bat");- try {- FileUtils.writeLines(- jobScriptFile,- new ArrayList<>(replacePlaceholders(commandExecutable.getCommands(), buildDir)),- "\r\n");- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- jobScriptFile = new File(buildDir, "job-commands.sh");- try {- FileUtils.writeLines(- jobScriptFile,- new ArrayList<>(replacePlaceholders(commandExecutable.getCommands(), buildDir)),- "\n");- } catch (IOException e) {- throw new RuntimeException(e);- }+ if (commandExecutable.getImage() != null) {+ throw new ExplicitException("This step should be executed by server docker executor, "+ + "remote docker executor, or kubernetes executor");+ }++ File jobScriptFile = new File(buildDir, "job-commands" + commandExecutable.getScriptExtension());+ try {+ FileUtils.writeLines(+ jobScriptFile,+ new ArrayList<>(replacePlaceholders(commandExecutable.getCommands(), buildDir)),+ commandExecutable.getEndOfLine());+ } catch (IOException e) {+ throw new RuntimeException(e);}for (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {@@ -186,13 +175,13 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat}}- Commandline shell = getShell();+ Commandline interpreter = commandExecutable.getInterpreter();Map<String, String> environments = new HashMap<>();environments.put("GIT_HOME", userDir.getAbsolutePath());- shell.workingDir(workspaceDir).environments(environments);- shell.addArgs(jobScriptFile.getAbsolutePath());+ interpreter.workingDir(workspaceDir).environments(environments);+ interpreter.addArgs(jobScriptFile.getAbsolutePath());- ExecutionResult result = shell.execute(newInfoLogger(jobLogger), newErrorLogger(jobLogger));+ ExecutionResult result = interpreter.execute(newInfoLogger(jobLogger), newErrorLogger(jobLogger));if (result.getReturnCode() != 0) {jobLogger.error("Step \"" + stepNames + "\" is failed: Command failed with exit code " + result.getReturnCode());return false;diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xmlindex 14b67c8928..e61394151b 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex 9d2b37bee0..f0ecdcb47d 100644--- a/server-plugin/server-plugin-import-gitea/pom.xml+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex 305e6a06b5..afb460ee01 100644--- a/server-plugin/server-plugin-import-github/pom.xml+++ b/server-plugin/server-plugin-import-github/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex 56970f6674..fa7f86c48d 100644--- a/server-plugin/server-plugin-import-gitlab/pom.xml+++ b/server-plugin/server-plugin-import-gitlab/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex fde7cb5f5f..a141d7dcca 100644--- a/server-plugin/server-plugin-import-jiracloud/pom.xml+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex 3290d8bf4b..8c77265a0b 100644--- a/server-plugin/server-plugin-import-youtrack/pom.xml+++ b/server-plugin/server-plugin-import-youtrack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex f2d35a7e16..82bcc245a6 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex d30fa5620e..0aa518cccd 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex def82496c8..6ba6d7caa6 100644--- a/server-plugin/server-plugin-report-coverage/pom.xml+++ b/server-plugin/server-plugin-report-coverage/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.report.coverage.CoverageReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xmlindex 52b699dcb6..097f60ef0a 100644--- a/server-plugin/server-plugin-report-cpd/pom.xml+++ b/server-plugin/server-plugin-report-cpd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xmlindex ae65b110e8..bdb372ab97 100644--- a/server-plugin/server-plugin-report-jacoco/pom.xml+++ b/server-plugin/server-plugin-report-jacoco/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 0da5ec31fe..5e40616c47 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex 5d8775355b..c75b0f3b2f 100644--- a/server-plugin/server-plugin-report-junit/pom.xml+++ b/server-plugin/server-plugin-report-junit/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 86a1436e2a..0c4d37d846 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex 10ffa2c38e..a5b72646d0 100644--- a/server-plugin/server-plugin-report-pmd/pom.xml+++ b/server-plugin/server-plugin-report-pmd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex d7970113a1..f67d107a7e 100644--- a/server-plugin/server-plugin-report-problem/pom.xml+++ b/server-plugin/server-plugin-report-problem/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.report.problem.ProblemReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex 525c424a30..bd3a43343d 100644--- a/server-plugin/server-plugin-report-spotbugs/pom.xml+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex afb439bd4d..b3881874e6 100644--- a/server-plugin/server-plugin-report-unittest/pom.xml+++ b/server-plugin/server-plugin-report-unittest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><properties><moduleClass>io.onedev.server.plugin.report.unittest.UnitTestReportModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex 2ae4cf1f0d..61a21d2458 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 9af9230e7b..90eb8e0170 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>6.1.4</version>+ <version>6.1.5</version></parent><dependencies><dependency>