bug: fix explicit channel setting with conda env.yaml (#1008)

* fix channel Signed-off-by: Jinjing.Zhou <[email protected]> * lint Signed-off-by: Jinjing.Zhou <[email protected]> * fix test Signed-off-by: Jinjing.Zhou <[email protected]> Signed-off-by: Jinjing.Zhou <[email protected]>
tensorchord · Oct 14, 2022 · d3f93a8 · d3f93a8
1 parent bcd8029
commit d3f93a8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/e2e/language/python_test.go b/e2e/language/python_test.go
@@ -54,4 +54,13 @@ var _ = Describe("python", Ordered, func() {
 		e.RunContainer()()
 		e.DestroyContainer()()
 	})
+
+	It("Should build conda with separate channel setting successfully", func() {
+		exampleName := "python/conda_channel"
+		testcase := "e2e"
+		e := e2e.NewExample(e2e.BuildContextDirWithName(exampleName), testcase)
+		e.BuildImage(true)()
+		e.RunContainer()()
+		e.DestroyContainer()()
+	})
 })
diff --git a/e2e/language/testdata/python/conda_channel/build.envd b/e2e/language/testdata/python/conda_channel/build.envd
@@ -0,0 +1,10 @@
+def build():
+    config.conda_channel(
+        channel="""
+channels:
+  - defaults
+  - dglteam # dgllife in env.yaml only works if specify channels here
+    """
+    )
+    install.conda_packages(env_file="env.yaml")
+    base(os="ubuntu20.04", language="python3.8")
diff --git a/e2e/language/testdata/python/conda_channel/env.yaml b/e2e/language/testdata/python/conda_channel/env.yaml
@@ -0,0 +1,3 @@
+name: imarobot # should ignore this name
+dependencies:
+  - dgl
diff --git a/pkg/lang/ir/conda.go b/pkg/lang/ir/conda.go
@@ -39,7 +39,7 @@ const (
 var (
 	// this file can be used by both conda and mamba
 	// https://mamba.readthedocs.io/en/latest/user_guide/configuration.html#multiple-rc-files
-	condarc = fileutil.EnvdHomeDir(".condarc")
+	condarc = "/opt/conda/.condarc"
 	//go:embed install-conda.sh
 	installCondaBash string
 	//go:embed install-mamba.sh