Skip to content

Commit

Permalink
image-builder: drop internal manifestgen in favor of images
Browse files Browse the repository at this point in the history
This commit drops the internal `manifestgen` package in favor
of using the version in `images` now that
osbuild/images#1153 is merged.
  • Loading branch information
mvo5 committed Jan 27, 2025
1 parent cf890c7 commit 21eba2c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 535 deletions.
5 changes: 3 additions & 2 deletions cmd/image-builder/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import (

"github.com/osbuild/images/pkg/distro"
"github.com/osbuild/images/pkg/imagefilter"
"github.com/osbuild/images/pkg/manifestgen"
"github.com/osbuild/images/pkg/osbuild"
"github.com/osbuild/images/pkg/ostree"
"github.com/osbuild/images/pkg/sbom"

"github.com/osbuild/image-builder-cli/internal/blueprintload"
"github.com/osbuild/image-builder-cli/internal/manifestgen"
)

type manifestOptions struct {
Expand Down Expand Up @@ -53,7 +54,7 @@ func generateManifest(dataDir string, img *imagefilter.Result, output io.Writer,
if err := os.MkdirAll(outputDir, 0755); err != nil {
return err
}
manifestGenOpts.SBOMWriter = func(filename string, content io.Reader) error {
manifestGenOpts.SBOMWriter = func(filename string, content io.Reader, docType sbom.StandardType) error {
return sbomWriter(outputDir, filename, content)
}
}
Expand Down
241 changes: 0 additions & 241 deletions internal/manifestgen/manifestgen.go

This file was deleted.

Loading

0 comments on commit 21eba2c

Please sign in to comment.