feat: support fish shell (#1952)

* feat: support fish shell

Signed-off-by: Keming <kemingyang@tensorchord.ai>

* Update pkg/lang/ir/v1/shell.go

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Keming <kemingy94@gmail.com>

* fix lint

Signed-off-by: Keming <kemingyang@tensorchord.ai>

---------

Signed-off-by: Keming <kemingyang@tensorchord.ai>
Signed-off-by: Keming <kemingy94@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: kemingy

pkg/lang/ir/v1/conda.go

@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	builderImage        = "curlimages/curl:7.86.0"
+	builderImage        = "curlimages/curl:8.11.1"
 	condaVersionDefault = "py311_24.11.1-0"
 	microMambaImage     = "mambaorg/micromamba:1.0.0"
 	condaRootPrefix     = "/opt/conda"
@@ -39,10 +39,19 @@ const (
 channels:
     - defaults
 `
-	mambaActivate = `
+	mambaActivateBash = `
 #!/bin/sh
 eval "$(/opt/conda/bin/micromamba shell hook --shell=bash)" || return $?
 micromamba activate "$@"
+`
+	mambaActivateFish = `
+#!/usr/bin/fish
+/opt/conda/bin/micromamba shell hook --shell=fish | source
+micromamba activate $argv
+`
+	condaActivateFish = `
+#!/usr/bin/fish
+conda activate $argv
 `
 )
 
@@ -174,6 +183,8 @@ func (g generalGraph) installMiniConda(root llb.State) llb.State {
 			llb.WithCustomName("[internal] create conda directory")).
 		Run(llb.Shlexf("bash -c '%s'", installCondaBash),
 			llb.WithCustomName("[internal] install conda")).Root().
+		File(llb.Mkfile(fmt.Sprintf("%s/activate.fish", condaBinDir), 0755, []byte(condaActivateFish)),
+			llb.WithCustomName("[internal] create the conda activate.fish file")).
 		File(llb.Rm(condaSourcePath), llb.WithCustomName("[internal] rm conda source file"))
 	return conda
 }
@@ -194,8 +205,10 @@ func (g *generalGraph) installMicroMamba(root llb.State) llb.State {
 			llb.WithCustomName("[internal] copy micromamba binary")).
 		File(llb.Mkfile(fmt.Sprintf("%s/.mambarc", condaRootPrefix), 0644, []byte(mambaRc)),
 			llb.WithCustomName("[internal] create the mamba rc file")).
-		File(llb.Mkfile(fmt.Sprintf("%s/activate", condaBinDir), 0755, []byte(mambaActivate)),
+		File(llb.Mkfile(fmt.Sprintf("%s/activate", condaBinDir), 0755, []byte(mambaActivateBash)),
 			llb.WithCustomName("[internal] create the mamba activate file")).
+		File(llb.Mkfile(fmt.Sprintf("%s/activate.fish", condaBinDir), 0755, []byte(mambaActivateFish)),
+			llb.WithCustomName("[internal] create the mamba activate.fish file")).
 		Run(llb.Shlexf("update-alternatives --install /usr/bin/conda conda %s/micromamba 1", condaBinDir),
 			llb.WithCustomName("[internal] update alternative micromamba to conda")).
 		Run(llb.Shlexf("bash -c \"%s/micromamba shell init --shell bash\"", condaBinDir),

pkg/lang/ir/v1/interface.go

@@ -197,7 +197,7 @@ func JuliaPackageServer(url string) error {
 func Shell(shell string) error {
 	g := DefaultGraph.(*generalGraph)
 
-	g.Shell = shell
+	g.Shell = strings.ToLower(shell)
 	return nil
 }
 

pkg/lang/ir/v1/shell.go

@@ -53,6 +53,8 @@ diverged = "<>"
 renamed = "r"
 deleted = "x"
 `
+
+	fishVersion = "4.0b1"
 )
 
 func (g *generalGraph) compileShell(root llb.State) (_ llb.State, err error) {
@@ -63,6 +65,9 @@ func (g *generalGraph) compileShell(root llb.State) (_ llb.State, err error) {
 		if err != nil {
 			return llb.State{}, err
 		}
+	} else if g.Shell == shellFish {
+		g.RuntimeEnviron["SHELL"] = "/usr/bin/fish"
+		root = g.compileFish(root)
 	}
 	if g.CondaConfig != nil {
 		root = g.compileCondaShell(root)
@@ -76,13 +81,17 @@ func (g *generalGraph) compileCondaShell(root llb.State) llb.State {
 		findDir = fileutil.EnvdHomeDir
 	}
 	rcPath := findDir(".bashrc")
+	activateFile := "activate"
 	if g.Shell == shellZSH {
 		rcPath = findDir(".zshrc")
+	} else if g.Shell == shellFish {
+		rcPath = findDir(".config/fish/config.fish")
+		activateFile = "activate.fish"
 	}
 	run := root.
 		Run(llb.Shlexf("bash -c \"%s\"", g.condaInitShell(g.Shell)),
 			llb.WithCustomNamef("[internal] init conda %s env", g.Shell)).
-		Run(llb.Shlexf(`bash -c 'echo "source %s/activate envd" >> %s'`, condaBinDir, rcPath),
+		Run(llb.Shlexf(`bash -c 'echo "source %s/%s envd" >> %s'`, condaBinDir, activateFile, rcPath),
 			llb.WithCustomNamef("[internal] add conda environment to %s", rcPath))
 	return run.Root()
 }
@@ -102,6 +111,10 @@ func (g *generalGraph) compilePrompt(root llb.State) llb.State {
 		run = run.Run(
 			llb.Shlexf(`bash -c 'echo "eval \"\$(starship init zsh)\"" >> %s'`, fileutil.EnvdHomeDir(".zshrc")),
 			llb.WithCustomName("[internal] setting prompt zsh config")).Root()
+	} else if g.Shell == shellFish {
+		run = run.Run(
+			llb.Shlexf(`bash -c 'echo "starship init fish | source" >> %s'`, fileutil.EnvdHomeDir(".config/fish/config.fish")),
+			llb.WithCustomName("[internal] setting prompt fish config")).Root()
 	}
 	return run
 }
@@ -126,3 +139,18 @@ func (g generalGraph) compileZSH(root llb.State) (llb.State, error) {
 		File(llb.Mkfile(zshrcPath, 0666, []byte(m.ZSHRC())))
 	return zshrc, nil
 }
+
+func (g generalGraph) compileFish(root llb.State) llb.State {
+	base := llb.Image(builderImage)
+	builder := base.Run(
+		llb.Shlexf(`sh -c "wget -qO- https://github.com/fish-shell/fish-shell/releases/download/%s/fish-static-linux-$(uname -m).tar.xz | tar -xJf - -C /tmp || exit 1"`, fishVersion),
+		llb.WithCustomName("[internal] download fish shell"),
+	).Root()
+	root = root.File(
+		llb.Copy(builder, "/tmp/fish", "/usr/bin/fish"),
+		llb.WithCustomName("[internal] copy fish shell from the builder image")).
+		Run(llb.Shlex("fish --install"),
+			llb.WithCustomName("[internal] install fish shell")).Root()
+
+	return root
+}

pkg/lang/ir/v1/types.go

@@ -97,4 +97,5 @@ type generalGraph struct {
 const (
 	shellBASH = "bash"
 	shellZSH  = "zsh"
+	shellFish = "fish"
 )