Skip to content

The Unified and Autonomous Development Platform

fix: Default shell incorrect for some operations

Robin Shen550c2e7e1cd7
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java
index 9250650a67..8675de730b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java
@@ -23,7 +23,9 @@ public class ClaudeCodeInContainer extends WorkspaceSpecTemplate {
workspaceSpec.setName(getName());
workspaceSpec.setRunInContainer(true);
workspaceSpec.setImage("1dev/claudecode");
- workspaceSpec.setShell(new PosixShell());
+ var shell = new PosixShell();
+ shell.setShell("bash");
+ workspaceSpec.setShell(shell);
workspaceSpec.setRunAs("1001:1001");
var shortcutConfig = new ShortcutConfig();
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java
index 5d73ce941e..2a47c0cc5c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java
@@ -23,7 +23,9 @@ public class CodexInContainer extends WorkspaceSpecTemplate {
workspaceSpec.setName(getName());
workspaceSpec.setRunInContainer(true);
workspaceSpec.setImage("1dev/codex");
- workspaceSpec.setShell(new PosixShell());
+ var shell = new PosixShell();
+ shell.setShell("bash");
+ workspaceSpec.setShell(shell);
workspaceSpec.setRunAs("1001:1001");
var shortcutConfig = new ShortcutConfig();
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java
index 184b88986f..13ec6ebd0a 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java
@@ -23,7 +23,9 @@ public class CursorInContainer extends WorkspaceSpecTemplate {
workspaceSpec.setName(getName());
workspaceSpec.setRunInContainer(true);
workspaceSpec.setImage("1dev/cursor");
- workspaceSpec.setShell(new PosixShell());
+ var shell = new PosixShell();
+ shell.setShell("bash");
+ workspaceSpec.setShell(shell);
workspaceSpec.setRunAs("1001:1001");
var shortcutConfig = new ShortcutConfig();
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java
index cc8aaa5ccf..11ba719a7b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java
@@ -24,7 +24,9 @@ public class OpenCodeInContainer extends WorkspaceSpecTemplate {
workspaceSpec.setRunInContainer(true);
workspaceSpec.setImage("1dev/opencode");
workspaceSpec.setRunAs("1001:1001");
- workspaceSpec.setShell(new PosixShell());
+ var shell = new PosixShell();
+ shell.setShell("bash");
+ workspaceSpec.setShell(shell);
var shortcutConfig = new ShortcutConfig();
shortcutConfig.setName("OpenCode");
diff --git a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
index b176ffde6d..deb1fbfae0 100644
--- a/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
+++ b/server-plugin/server-plugin-buildspec-python/src/main/java/io/onedev/server/plugin/buildspec/python/PythonJobSuggestion.java
@@ -100,6 +100,7 @@ public class PythonJobSuggestion implements JobSuggestion {
private CommandStep newPipBuildAndTestStep(String dependencyInstallCommand, boolean withPytest) {
CommandStep buildAndTest = new CommandStep();
var interpreter = new PosixInterpreter();
+ interpreter.setShell("bash");
buildAndTest.setInterpreter(interpreter);
buildAndTest.setName("build and test");
buildAndTest.setImage("python");
@@ -343,7 +344,9 @@ public class PythonJobSuggestion implements JobSuggestion {
CommandStep buildAndTest = new CommandStep();
buildAndTest.setName("build and test");
buildAndTest.setImage("1dev/conda:1.0.4");
- buildAndTest.setInterpreter(new PosixInterpreter());
+ var interpreter = new PosixInterpreter();
+ interpreter.setShell("bash");
+ buildAndTest.setInterpreter(interpreter);
String commands = "" +
"set -e\n" +
"source /root/.bashrc\n" +