Merge pull request #953 from traPtitech/fix/builder/close-ch

Runtimeアプリのビルド設定で、存在しないディレクトリをContextに指定するとbuilderがハングするのを修正

pkg/usecase/builder/build_buildkit.go

@@ -115,6 +115,14 @@ func (s *builderService) solveDockerfile(
 	env map[string]string,
 	ch chan *buildkit.SolveStatus,
 ) error {
+	// ch must be closed when this function returns because it is listened by progress ui display
+	var channelClosed bool = false
+	defer func() {
+		if !channelClosed {
+			close(ch)
+		}
+	}()
+
 	ctxMount, err := fsutil.NewFS(contextDir)
 	if err != nil {
 		return errors.Wrap(err, "invalid context mount dir")
@@ -123,6 +131,7 @@ func (s *builderService) solveDockerfile(
 	if err != nil {
 		return errors.Wrap(err, "invalid dockerfile mount dir")
 	}
+
 	opts := buildkit.SolveOpt{
 		Exports: []buildkit.ExportEntry{{
 			Type: buildkit.ExporterImage,
@@ -144,7 +153,11 @@ func (s *builderService) solveDockerfile(
 		),
 		Session: s.authSessions(),
 	}
+
 	_, err = s.buildkit.Solve(ctx, nil, opts, ch)
+	// ch is closed by buildkit.Solve
+	channelClosed = true
+
 	return err
 }