feat: bring apt-source compilation earlier (#1554)

Signed-off-by: Xing Lv <xlv20@fudan.edu.cn>
tensorchord · Apr 10, 2023 · e383395 · e383395
1 parent dd48167
commit e383395
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/lang/ir/v1/compile.go b/pkg/lang/ir/v1/compile.go
@@ -286,22 +286,22 @@ func (g *generalGraph) CompileLLB(uid, gid int) (llb.State, error) {
 	if err != nil {
 		return llb.State{}, errors.Wrap(err, "failed to get the base image")
 	}
+	aptMirror := g.compileUbuntuAPT(base)
 
 	// prepare dev env: stable operations should be done here to make it cache friendly
 	if g.Dev {
-		dev := g.compileDevPackages(base)
+		dev := g.compileDevPackages(aptMirror)
 		sshd := g.compileSSHD(dev)
 		horust := g.installHorust(sshd)
 		starship := g.compileStarship(horust)
 		userGroup := g.compileUserGroup(starship)
-		base = userGroup
+		aptMirror = userGroup
 	}
 
-	lang, err := g.compileLanguage(base)
+	lang, err := g.compileLanguage(aptMirror)
 	if err != nil {
 		return llb.State{}, errors.Wrap(err, "failed to compile language")
 	}
-	aptMirror := g.compileUbuntuAPT(base)
 	systemPackages := g.compileSystemPackages(aptMirror)
 	merge := llb.Merge([]llb.State{
 		base,