File tree Expand file tree Collapse file tree 2 files changed +9
-10
lines changed Expand file tree Collapse file tree 2 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ import (
30
30
const (
31
31
builderImage = "curlimages/curl:8.11.1"
32
32
condaVersionDefault = "py311_24.11.1-0"
33
- microMambaImage = "mambaorg/micromamba:1 .0.0 "
33
+ microMambaImage = "mambaorg/micromamba:2 .0.6 "
34
34
condaRootPrefix = "/opt/conda"
35
35
condaBinDir = "/opt/conda/bin"
36
36
condaSourcePath = "/tmp/miniconda.sh"
@@ -86,7 +86,7 @@ func (g generalGraph) condaCommandPath() string {
86
86
func (g generalGraph ) condaInitShell (shell string ) string {
87
87
path := g .condaCommandPath ()
88
88
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 )
90
90
}
91
91
return fmt .Sprintf ("%s init %s" , path , shell )
92
92
}
Original file line number Diff line number Diff line change @@ -91,14 +91,13 @@ func (g generalGraph) getAppropriatePythonVersion() (string, error) {
91
91
func (g generalGraph ) compileAlternative (root llb.State ) llb.State {
92
92
envdPrefix := "/opt/conda/envs/envd/bin"
93
93
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" ))
102
101
return run .Root ()
103
102
}
104
103
You can’t perform that action at this time.
0 commit comments