pin output to out.tar regardless of dest argument (#40)

Author: wlan0

pkg/build/build.go

@@ -88,7 +88,7 @@ func Build(ctx context.Context, opts *BOpts) error {
 		export.Output = func(map[string]string) (io.WriteCloser, error) {
 			return wf, nil
 		}
-		export.Attrs["output"] = filepath.Join(opts.basePath, "out.tar")
+		export.Attrs["output"] = filepath.Join(GlobalExportPath, opts.BuildID, "out.tar")
 		if _, ok := export.Attrs["name"]; !ok {
 			export.Attrs["name"] = opts.Tag
 		}

pkg/stream/pipeline.go

@@ -120,13 +120,15 @@ func (p *StreamPipeline) Run() error {
 				case err == nil:
 					stage.process(pkt)
 					handled = true
-					break
 				case errors.Is(err, ErrIgnorePacket):
 					continue
 				default: // real error
 					logrus.WithError(err).Warn("Filter error")
 					continue
 				}
+				if handled {
+					break
+				}
 			}
 			if !handled {
 				logrus.WithField("build_id", pkt.BuildId).Debug("dropped unhandled packet")
@@ -136,6 +138,6 @@ func (p *StreamPipeline) Run() error {
 
 	<-p.ctx.Done()
 	p.wg.Wait()
-	close(p.sendCh)
+	// Don't close sendCh - let it be garbage collected to avoid "send on closed channel" panic
 	return p.ctx.Err()
 }