Skip to content

Commit 6b49023

Browse files
authored
feat: upgrade to micromamba2 (#1971)
Signed-off-by: Keming <kemingyang@tensorchord.ai>
1 parent b53e06d commit 6b49023

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

pkg/lang/ir/v1/conda.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
const (
3131
builderImage = "curlimages/curl:8.11.1"
3232
condaVersionDefault = "py311_24.11.1-0"
33-
microMambaImage = "mambaorg/micromamba:1.0.0"
33+
microMambaImage = "mambaorg/micromamba:2.0.6"
3434
condaRootPrefix = "/opt/conda"
3535
condaBinDir = "/opt/conda/bin"
3636
condaSourcePath = "/tmp/miniconda.sh"
@@ -86,7 +86,7 @@ func (g generalGraph) condaCommandPath() string {
8686
func (g generalGraph) condaInitShell(shell string) string {
8787
path := g.condaCommandPath()
8888
if g.CondaConfig.UseMicroMamba {
89-
return fmt.Sprintf("%s shell init -p %s -s %s", path, condaRootPrefix, shell)
89+
return fmt.Sprintf("%s shell init -s %s %s", path, shell, condaRootPrefix)
9090
}
9191
return fmt.Sprintf("%s init %s", path, shell)
9292
}

pkg/lang/ir/v1/python.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,13 @@ func (g generalGraph) getAppropriatePythonVersion() (string, error) {
9191
func (g generalGraph) compileAlternative(root llb.State) llb.State {
9292
envdPrefix := "/opt/conda/envs/envd/bin"
9393
run := root.
94-
Run(llb.Shlexf("update-alternatives --install /usr/bin/python python %s/python 1", envdPrefix),
95-
llb.WithCustomName("[internal] update alternative python to envd")).
96-
Run(llb.Shlexf("update-alternatives --install /usr/bin/python3 python3 %s/python3 1", envdPrefix),
97-
llb.WithCustomName("[internal] update alternative python3 to envd")).
98-
Run(llb.Shlexf("update-alternatives --install /usr/bin/pip pip %s/pip 1", envdPrefix),
99-
llb.WithCustomName("[internal] update alternative pip to envd")).
100-
Run(llb.Shlexf("update-alternatives --install /usr/bin/pip3 pip3 %s/pip3 1", envdPrefix),
101-
llb.WithCustomName("[internal] update alternative pip3 to envd"))
94+
Run(llb.Shlexf(`sh -c "
95+
update-alternatives --install /usr/bin/python python %[1]s/python 1 &&
96+
update-alternatives --install /usr/bin/python3 python3 %[1]s/python3 1 &&
97+
update-alternatives --install /usr/bin/pip pip %[1]s/pip 1 &&
98+
update-alternatives --install /usr/bin/pip3 pip3 %[1]s/pip3 1
99+
"`, envdPrefix),
100+
llb.WithCustomName("[internal] update alternative python/python3/pip/pip3 to envd"))
102101
return run.Root()
103102
}
104103

0 commit comments

Comments
 (0)