Skip to content

The Unified and Autonomous Development Platform

Fix issue #364 - TTY option to run commands

Robin Shen8afea7fe0b7a
diff --git a/pom.xml b/pom.xml
index 0a51295ece..0dd0511002 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<version>1.0.5</version>
</parent>
<artifactId>server</artifactId>
- <version>4.8.0</version>
+ <version>4.8.1</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
@@ -554,7 +554,7 @@
</repositories>
<properties>
<commons.version>2.0.11</commons.version>
- <k8shelper.version>2.1.5</k8shelper.version>
+ <k8shelper.version>2.1.6</k8shelper.version>
<slf4j.version>1.7.5</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.xml
index 9c895c6d9a..2040bc0702 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.8.0</version>
+ <version>4.8.1</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.java
index df30fdd242..201c4c391b 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
@@ -1001,4 +1001,48 @@ public class BuildSpec implements Serializable, Validatable {
}
}
+ @SuppressWarnings("unused")
+ private void migrate9(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, "useTTY"),
+ new ScalarNode(Tag.BOOL, "false")));
+ }
+ }
+ }
+ }
+ }
+ } 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, "useTTY"),
+ new ScalarNode(Tag.BOOL, "false")));
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
}
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 2db073401f..a5973717fc 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
@@ -26,6 +26,8 @@ public class CommandStep extends Step {
private List<String> commands = new ArrayList<>();
+ private boolean useTTY;
+
@Editable(order=100, description="Specify docker image to execute commands inside")
@Interpolative(variableSuggester="suggestVariables")
@NotEmpty
@@ -50,6 +52,18 @@ public class CommandStep extends Step {
this.commands = commands;
}
+ @Editable(order=120, name="Enable TTY Mode", description="Many commands print outputs with ANSI colors in "
+ + "TTY mode to help identifying problems easily. However some commands running in this mode may "
+ + "wait for user input to cause build hanging. This can normally be fixed by adding extra options "
+ + "to the command")
+ public boolean isUseTTY() {
+ return useTTY;
+ }
+
+ public void setUseTTY(boolean useTTY) {
+ this.useTTY = useTTY;
+ }
+
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestVariables(String matchWith) {
return BuildSpec.suggestVariables(matchWith, false, false);
@@ -62,7 +76,7 @@ public class CommandStep extends Step {
@Override
public Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {
- return new CommandExecutable(getImage(), getCommands());
+ return new CommandExecutable(getImage(), getCommands(), isUseTTY());
}
}
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index d8d0e5a7bc..8144535cae 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -2581,4 +2581,24 @@ public class DataMigrator {
}
}
+ private void migrate60(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.elementTextTrim("key").equals("JOB_EXECUTORS")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ for (Element executorElement: valueElement.elements()) {
+ if (executorElement.getName().equals("io.onedev.server.plugin.docker.DockerExecutor"))
+ executorElement.setName("io.onedev.server.plugin.executor.docker.DockerExecutor");
+ }
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index c8f33543f2..3f73f35220 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml
index 206fdcf2f8..6f2eee85a2 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>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<build>
<resources>
diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xml
index 4311aa13b2..eee691b9e2 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>4.8.0</version>
+ <version>4.8.1</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.xml
index 2feffda093..28c7671be1 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>4.8.0</version>
+ <version>4.8.1</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.xml
index 85f8e0bb95..922f62b2ec 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>4.8.0</version>
+ <version>4.8.1</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.xml
index a4d14605b6..1322e5915f 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>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-docker/pom.xml b/server-plugin/server-plugin-executor-docker/pom.xml
index 084a03fb12..391b6d6779 100644
--- a/server-plugin/server-plugin-executor-docker/pom.xml
+++ b/server-plugin/server-plugin-executor-docker/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<properties>
- <moduleClass>io.onedev.server.plugin.docker.DockerModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.executor.docker.DockerModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerExecutor.java
similarity index 99%
rename from server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
rename to server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerExecutor.java
index f2e8a27557..91e4a8620d 100644
--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerExecutor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.docker;
+package io.onedev.server.plugin.executor.docker;
import static io.onedev.k8shelper.KubernetesHelper.cloneRepository;
import static io.onedev.k8shelper.KubernetesHelper.getCacheInstances;
@@ -70,7 +70,7 @@ import io.onedev.server.buildspec.job.log.StyleBuilder;
import io.onedev.server.git.config.GitConfig;
import io.onedev.server.model.support.RegistryLogin;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.plugin.docker.DockerExecutor.TestData;
+import io.onedev.server.plugin.executor.docker.DockerExecutor.TestData;
import io.onedev.server.util.ExceptionUtils;
import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
@@ -593,6 +593,8 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
}
+ if (commandExecutable.isUseTTY())
+ docker.addArgs("-t");
docker.addArgs("-w", containerWorkspace, "--entrypoint=" + containerEntryPoint);
docker.addArgs(commandExecutable.getImage());
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerModule.java
similarity index 97%
rename from server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java
rename to server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerModule.java
index e73b517fdc..da7ab33880 100644
--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java
+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerModule.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.docker;
+package io.onedev.server.plugin.executor.docker;
import java.util.Collection;
diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml
index a1cd4b1a01..d24041c62d 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>4.8.0</version>
+ <version>4.8.1</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.java
index 0547ee85d6..95d2d19521 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
@@ -823,7 +823,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
} else {
List<Action> actions = new ArrayList<>();
CommandExecutable executable = new CommandExecutable((String) executionContext,
- Lists.newArrayList("this does not matter"));
+ Lists.newArrayList("this does not matter"), false);
actions.add(new Action("test", executable, ExecuteCondition.ALWAYS));
entryExecutable = new CompositeExecutable(actions);
}
@@ -853,16 +853,19 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
public Void visit(LeafExecutable executable, List<Integer> position) {
String containerName = getContainerName(position);
containerNames.add(containerName);
- String image;
- if (executable instanceof CommandExecutable)
- image = ((CommandExecutable)executable).getImage();
- else
- image = "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion;
+ Map<Object, Object> stepContainerSpec;
+ if (executable instanceof CommandExecutable) {
+ stepContainerSpec = CollectionUtils.newHashMap(
+ "name", containerName,
+ "image", ((CommandExecutable)executable).getImage());
+ if (((CommandExecutable) executable).isUseTTY())
+ stepContainerSpec.put("tty", true);
+ } else {
+ stepContainerSpec = CollectionUtils.newHashMap(
+ "name", containerName,
+ "image", "1dev/k8s-helper-" + baselineOsInfo.getHelperImageSuffix() + ":" + helperImageVersion);
+ }
- Map<Object, Object> stepContainerSpec = CollectionUtils.newHashMap(
- "name", containerName,
- "image", image);
-
String positionStr = stringifyPosition(position);
if (baselineOsInfo.isLinux()) {
stepContainerSpec.put("command", Lists.newArrayList("sh"));
diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xml
index 81f430fc28..b9beb1921a 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>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xml
index 624ec45f22..4d6ae84bb4 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>4.8.0</version>
+ <version>4.8.1</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.xml
index 8886cbd2c9..531ac6e63c 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>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.checkstyle.CheckstylePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml
index 0b89e72464..a6c5d1ee0c 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>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.clover.CloverPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xml
index aec57e882d..c184a0952a 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>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.jest.JestTestReportModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml
index cb215ffdb5..e2d82b68f8 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>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>
diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml
index f5c458f6bd..5cbd3decc7 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>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-product/pom.xml b/server-product/pom.xml
index 46d87a7ef4..8e747c2926 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.8.0</version>
+ <version>4.8.1</version>
</parent>
<dependencies>
<dependency>