fix: pre mkdir for runtime mount (#1153)

* fix: pre mkdir for runtime mount Signed-off-by: Keming <kemingyang@tensorchord.ai> * rebase Signed-off-by: Keming <kemingyang@tensorchord.ai> Signed-off-by: Keming <kemingyang@tensorchord.ai>
tensorchord · Nov 4, 2022 · 1af3449 · 1af3449
1 parent a6c6081
commit 1af3449
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/pkg/lang/ir/compile.go b/pkg/lang/ir/compile.go
@@ -304,7 +304,8 @@ func (g Graph) Compile(uid, gid int) (llb.State, error) {
 	run := g.compileRun(copy)
 	git := g.compileGit(run)
 	user := g.compileUserOwn(git)
-	entrypoint, err := g.compileEntrypoint(user)
+	mount := g.compileMountDir(user)
+	entrypoint, err := g.compileEntrypoint(mount)
 	if err != nil {
 		return llb.State{}, errors.Wrap(err, "failed to compile entrypoint")
 	}

diff --git a/pkg/lang/ir/supervisor.go b/pkg/lang/ir/supervisor.go
@@ -55,8 +55,10 @@ func (g Graph) installHorust(root llb.State) llb.State {
 	horust := root.
 		File(llb.Copy(llb.Image(types.HorustImage), "/", "/usr/local/bin"),
 			llb.WithCustomName("[internal] install horust")).
-		File(llb.Mkdir(types.HorustServiceDir, 0755, llb.WithParents(true))).
-		File(llb.Mkdir(types.HorustLogDir, 0777, llb.WithParents(true)))
+		File(llb.Mkdir(types.HorustServiceDir, 0755, llb.WithParents(true)),
+			llb.WithCustomNamef("[internal] mkdir for horust service: %s", types.HorustServiceDir)).
+		File(llb.Mkdir(types.HorustLogDir, 0777, llb.WithParents(true)),
+			llb.WithCustomNamef("[internal] mkdir for horust log: %s", types.HorustLogDir))
 	return horust
 }
 

diff --git a/pkg/lang/ir/system.go b/pkg/lang/ir/system.go
@@ -268,3 +268,14 @@ func (g Graph) copySSHKey(root llb.State) (llb.State, error) {
 			llb.WithCustomName("[internal] install ssh keys"))
 	return run, nil
 }
+
+func (g Graph) compileMountDir(root llb.State) llb.State {
+	mount := root
+	for _, m := range g.Mount {
+		mount = mount.File(llb.Mkdir(m.Destination, 0755, llb.WithParents(true),
+			llb.WithUIDGID(g.uid, g.gid)),
+			llb.WithCustomNamef("[internal] create dir for runtime.mount %s", m.Destination),
+		)
+	}
+	return mount
+}