The Unified and Autonomous Development Platform
feat: Add support for file: notion for variable interpolation of command image field (OD-2652)
Robin Shenb1dbe8ee1927
diff --git a/pom.xml b/pom.xmlindex bc15015d2a..38e39664d9 100644--- a/pom.xml+++ b/pom.xml@@ -677,7 +677,7 @@</repositories><properties><commons.version>3.1.6</commons.version>- <agent.version>2.3.8</agent.version>+ <agent.version>2.3.9</agent.version><slf4j.version>2.0.9</slf4j.version><logback.version>1.4.14</logback.version><antlr.version>4.7.2</antlr.version>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 fc2361676c..ab23d23d3a 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@@ -60,7 +60,7 @@ public class CommandStep extends Step {@Editable(order=100, name="container:image", description="Specify container image to execute commands inside")@DependsOn(property="runInContainer")- @Interpolative(variableSuggester="suggestVariables")+ @Interpolative(variableSuggester="suggestDynamicVariables")@NotEmptypublic String getImage() {return image;@@ -70,16 +70,6 @@ public class CommandStep extends Step {this.image = image;}- static List<InputSuggestion> suggestVariables(String matchWith) {- /*- * We do not support dynamic variable here as:- * 1. @file:@ notion will not work for workspace files generated in current step- * 2. It is very easy to use file content in shell script via shell utilities- * in regardless the file is generated in current or previous steps- */- return BuildSpec.suggestVariables(matchWith, false, false, false);- }-@Editable(order=110)@Valid@NotNull@@ -160,4 +150,18 @@ public class CommandStep extends Step {return !(executor instanceof DockerAware);}+ static List<InputSuggestion> suggestDynamicVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, true, true, false);+ }++ static List<InputSuggestion> suggestVariables(String matchWith) {+ /*+ * We do not support dynamic variable here as:+ * 1. @file:@ notion will not work for workspace files generated in current step+ * 2. It is very easy to use file content in shell script via shell utilities+ * in regardless the file is generated in current or previous steps+ */+ return BuildSpec.suggestVariables(matchWith, true, false, false);+ }+}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 412b433830..4a4902b25e 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@@ -466,7 +466,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, TeownerChanged.set(false);}if (facade instanceof CommandFacade) {- CommandFacade commandFacade = (CommandFacade) facade;+ CommandFacade commandFacade = ((CommandFacade) facade).replacePlaceholders(hostBuildHome);if (commandFacade.getImage() == null) {throw new ExplicitException("This step can only be executed by server shell "