Skip to content

The Unified and Autonomous Development Platform

Agent tips improvement

Robin Shenac174eeabb58
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 367139ac5e..c402d3d7fd 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
@@ -41,7 +41,8 @@ public class CommandStep extends Step {
}
@Editable(order=110, description="Specify content of Linux shell script or Windows command batch to execute "
- + "under the <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>")
+ + "under the <a href='$docRoot/pages/concepts.md#job-workspace'>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")
@Size(min=1, message="may not be empty")
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html
index 1837a00271..5c66e714f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html
@@ -7,7 +7,7 @@
<ol>
<li>Make sure <a href="https://openjdk.java.net" target="_blank">JDK 1.8 or higher</a> is installed</li>
<li>
- If you plan to use the agent to run docker jobs, make sure that:
+ If you plan to execute jobs inside containers on this agent, make sure that::
<ul>
<li>Docker engine is installed and docker command line is available in system path</li>
<li>Make sure current user has permission to run docker containers</li>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
index be730a91a3..8a8a4c9382 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
@@ -1,5 +1,9 @@
<wicket:extend>
- <div class="alert alert-info mb-5"><wicket:svg href="bulb" class="icon"></wicket:svg> Agents can be used to run jobs on remote machines without Kubernetes</div>
+ <div class="alert alert-info mb-5">
+ <wicket:svg href="bulb" class="icon"></wicket:svg>
+ Agents can be used to execute jobs on remote machines. Once started it will update itself
+ from server automatically when necessary
+ </div>
<div class="side-main side-main-wrap">
<div wicket:id="savedQueries" class="side"></div>
<div wicket:id="agents" class="main"></div>