fix: compile vscode extensions with user state (#1564)

* fix: compile vscode extensions with user state Signed-off-by: hang lv <xlv20@fudan.edu.cn> * fix: install extension in parallel Signed-off-by: hang lv <xlv20@fudan.edu.cn> * fix: merge diffed extensions states Signed-off-by: hang lv <xlv20@fudan.edu.cn> --------- Signed-off-by: hang lv <xlv20@fudan.edu.cn>
tensorchord · Apr 20, 2023 · f3acdff · f3acdff
1 parent bc0eaf8
commit f3acdff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/pkg/lang/ir/v1/compile.go b/pkg/lang/ir/v1/compile.go
@@ -336,14 +336,11 @@ func (g *generalGraph) CompileLLB(uid, gid int) (llb.State, error) {
 		if err != nil {
 			return llb.State{}, errors.Wrap(err, "failed to compile entrypoint")
 		}
-		vscode, err := g.compileVSCode()
+		vscode, err := g.compileVSCode(entrypoint)
 		if err != nil {
 			return llb.State{}, errors.Wrap(err, "failed to compile VSCode extensions")
 		}
-		copy = llb.Merge([]llb.State{
-			entrypoint,
-			vscode,
-		}, llb.WithCustomName("[internal] final dev environment"))
+		copy = vscode
 	}
 
 	// it's necessary to exec `run` with the desired user

diff --git a/pkg/lang/ir/v1/editor.go b/pkg/lang/ir/v1/editor.go
@@ -29,11 +29,11 @@ import (
 	"github.com/tensorchord/envd/pkg/util/fileutil"
 )
 
-func (g generalGraph) compileVSCode() (llb.State, error) {
+func (g generalGraph) compileVSCode(root llb.State) (llb.State, error) {
 	if len(g.VSCodePlugins) == 0 {
-		return llb.Scratch(), nil
+		return root, nil
 	}
-	inputs := []llb.State{}
+	inputs := []llb.State{root}
 	for _, p := range g.VSCodePlugins {
 		vscodeClient, err := vscode.NewClient(vscode.MarketplaceVendorOpenVSX)
 		if err != nil {
@@ -45,14 +45,14 @@ func (g generalGraph) compileVSCode() (llb.State, error) {
 			return llb.State{}, err
 		}
 		g.Writer.LogVSCodePlugin(p, compileui.ActionEnd, cached)
-		ext := llb.Scratch().File(llb.Copy(llb.Local(flag.FlagCacheDir),
+		ext := root.File(llb.Copy(llb.Local(flag.FlagCacheDir),
 			vscodeClient.PluginPath(p),
 			fileutil.EnvdHomeDir(".vscode-server", "extensions", p.String()),
 			&llb.CopyInfo{
 				CreateDestPath: true,
 			}, llb.WithUIDGID(g.uid, g.gid)),
 			llb.WithCustomNamef("install vscode plugin %s", p.String()))
-		inputs = append(inputs, ext)
+		inputs = append(inputs, llb.Diff(root, ext))
 	}
 	layer := llb.Merge(inputs, llb.WithCustomName("merging plugins for vscode"))
 	return layer, nil