Skip to content

The Unified and Autonomous Development Platform

fix: UI minor improvement

Robin Shen08e77b23d407
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Service.java b/server-core/src/main/java/io/onedev/server/buildspec/Service.java
index 8b2857cb9c..de5ed2dd83 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Service.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Service.java
@@ -25,14 +25,14 @@ public class Service implements NamedElement, Serializable {
private String image;
- private String runAs;
-
private String arguments;
private List<EnvVar> envVars = new ArrayList<>();
private String readinessCheckCommand;
+ private String runAs;
+
private String builtInRegistryAccessTokenSecret;
@Editable(order=100, description="Specify name of the service, which will be used as host name to access the service")
@@ -70,18 +70,6 @@ public class Service implements NamedElement, Serializable {
this.image = image;
}
- @Editable(order=210, name="Run As", placeholder = "root", description = "Optionally specify uid:gid to run container as. " +
- "<b class='text-warning'>Note:</b> This setting should be left empty if underlying container facility is " +
- "rootless or use user namespace remapping")
- @RegEx(pattern="\\d+:\\d+", message = "Should be specified in form of <uid>:<gid>")
- public String getRunAs() {
- return runAs;
- }
-
- public void setRunAs(String runAs) {
- this.runAs = runAs;
- }
-
@Editable(order=220, description="Optionally specify arguments to run above image")
@Interpolative(variableSuggester="suggestVariables")
public String getArguments() {
@@ -115,6 +103,18 @@ public class Service implements NamedElement, Serializable {
this.readinessCheckCommand = readinessCheckCommand;
}
+ @Editable(order=450, name="Run As", group = "More Settings", placeholder = "root", description = "Optionally specify uid:gid to run container as. " +
+ "<b class='text-warning'>Note:</b> This setting should be left empty if underlying container facility is " +
+ "rootless or use user namespace remapping")
+ @RegEx(pattern="\\d+:\\d+", message = "Should be specified in form of <uid>:<gid>")
+ public String getRunAs() {
+ return runAs;
+ }
+
+ public void setRunAs(String runAs) {
+ this.runAs = runAs;
+ }
+
@Editable(order=500, name="Built-in Registry Access Token", group="More Settings", description = "Specify access token for built-in docker registry if necessary")
@ChoiceProvider("getAccessTokenSecretChoices")
public String getBuiltInRegistryAccessTokenSecret() {
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.java
index 7776161de1..73b1ce7227 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
@@ -34,11 +34,11 @@ public class CommandStep extends Step {
private String image;
+ private Interpreter interpreter = new DefaultInterpreter();
+
private String runAs;
private String builtInRegistryAccessTokenSecret;
-
- private Interpreter interpreter = new DefaultInterpreter();
private boolean useTTY = true;
@@ -67,20 +67,7 @@ public class CommandStep extends Step {
public void setImage(String image) {
this.image = image;
}
-
- @Editable(order=105, name="Run As", placeholder = "root", description = "Optionally specify uid:gid to run container as. " +
- "<b class='text-warning'>Note:</b> This setting should be left empty if underlying container facility is " +
- "rootless or use user namespace remapping")
- @ShowCondition("isRunInContainerEnabled")
- @RegEx(pattern="\\d+:\\d+", message = "Should be specified in form of <uid>:<gid>")
- public String getRunAs() {
- return runAs;
- }
-
- public void setRunAs(String runAs) {
- this.runAs = runAs;
- }
-
+
static List<InputSuggestion> suggestVariables(String matchWith) {
return BuildSpec.suggestVariables(matchWith, false, false, false);
}
@@ -94,6 +81,19 @@ public class CommandStep extends Step {
public void setInterpreter(Interpreter interpreter) {
this.interpreter = interpreter;
}
+
+ @Editable(order=8000, name="Run As", group = "More Settings", placeholder = "root", description = "Optionally specify uid:gid to run container as. " +
+ "<b class='text-warning'>Note:</b> This setting should be left empty if underlying container facility is " +
+ "rootless or use user namespace remapping")
+ @ShowCondition("isRunInContainerEnabled")
+ @RegEx(pattern="\\d+:\\d+", message = "Should be specified in form of <uid>:<gid>")
+ public String getRunAs() {
+ return runAs;
+ }
+
+ public void setRunAs(String runAs) {
+ this.runAs = runAs;
+ }
@Editable(order=9000, name="Built-in Registry Access Token Secret", group = "More Settings",
descriptionProvider = "getBuiltInRegistryAccessTokenSecretDescription")
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.java
index 463b10482e..a08926d3a5 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
@@ -34,10 +34,10 @@ public class RunContainerStep extends Step {
private String image;
- private String runAs;
-
private String args;
+ private String runAs;
+
private List<EnvVar> envVars = new ArrayList<>();
private String workingDir;
@@ -59,18 +59,6 @@ public class RunContainerStep extends Step {
this.image = image;
}
- @Editable(order=150, name="Run As", placeholder = "root", description = "Optionally specify uid:gid to run container as. " +
- "<b class='text-warning'>Note:</b> This setting should be left empty if underlying container facility is " +
- "rootless or use user namespace remapping")
- @RegEx(pattern="\\d+:\\d+", message = "Should be specified in form of <uid>:<gid>")
- public String getRunAs() {
- return runAs;
- }
-
- public void setRunAs(String runAs) {
- this.runAs = runAs;
- }
-
@Editable(order=200, name="Arguments", description="Optionally specify container arguments separated by space. " +
"Single argument containing space should be quoted. <b class='text-warning'>Note: </b> do not confuse " +
"this with container options which should be specified in executor setting")
@@ -83,6 +71,18 @@ public class RunContainerStep extends Step {
this.args = args;
}
+ @Editable(order=250, name="Run As", group = "More Settings", placeholder = "root", description = "Optionally specify uid:gid to run container as. " +
+ "<b class='text-warning'>Note:</b> This setting should be left empty if underlying container facility is " +
+ "rootless or use user namespace remapping")
+ @RegEx(pattern="\\d+:\\d+", message = "Should be specified in form of <uid>:<gid>")
+ public String getRunAs() {
+ return runAs;
+ }
+
+ public void setRunAs(String runAs) {
+ this.runAs = runAs;
+ }
+
@Editable(order=300, name="Working Directory", placeholder = "Container default", group="More Settings", description="Optionally specify working directory of the container. "
+ "Leave empty to use default working directory of the container")
@Interpolative(variableSuggester="suggestVariables")