Update the osbuild/images to the version which introduces "dot notation" for distro release versions. - Replace all uses of distroregistry by distrofactory. - Delete local version of reporegistry and use the one from the osbuild/images. - Weldr: unify `createWeldrAPI()` and `createWeldrAPI2()` into a single `createTestWeldrAPI()` function`. - store/fixture: rework fixtures to allow overriding the host distro name and host architecture name. A cleanup function to restore the host distro and arch names is always part of the fixture struct. - Delete `distro_mock` package, since it is no longer used. - Bump the required version of osbuild to 98, because the OSCAP customization is using the 'compress_results' stage option, which is not available in older versions of osbuild. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
68 lines
1.6 KiB
Go
68 lines
1.6 KiB
Go
package manifest
|
|
|
|
import (
|
|
"github.com/osbuild/images/pkg/artifact"
|
|
"github.com/osbuild/images/pkg/osbuild"
|
|
)
|
|
|
|
// A Tar represents the contents of another pipeline in a tar file
|
|
type Tar struct {
|
|
Base
|
|
filename string
|
|
|
|
Format osbuild.TarArchiveFormat
|
|
RootNode osbuild.TarRootNode
|
|
ACLs *bool
|
|
SELinux *bool
|
|
Xattrs *bool
|
|
|
|
inputPipeline Pipeline
|
|
}
|
|
|
|
func (p Tar) Filename() string {
|
|
return p.filename
|
|
}
|
|
|
|
func (p *Tar) SetFilename(filename string) {
|
|
p.filename = filename
|
|
}
|
|
|
|
// NewTar creates a new TarPipeline. The inputPipeline represents the
|
|
// filesystem tree which will be the contents of the tar file. The pipelinename
|
|
// is the name of the pipeline. The filename is the name of the output tar file.
|
|
func NewTar(buildPipeline Build, inputPipeline Pipeline, pipelinename string) *Tar {
|
|
p := &Tar{
|
|
Base: NewBase(pipelinename, buildPipeline),
|
|
inputPipeline: inputPipeline,
|
|
filename: "image.tar",
|
|
}
|
|
buildPipeline.addDependent(p)
|
|
return p
|
|
}
|
|
|
|
func (p *Tar) serialize() osbuild.Pipeline {
|
|
pipeline := p.Base.serialize()
|
|
|
|
tarOptions := &osbuild.TarStageOptions{
|
|
Filename: p.Filename(),
|
|
Format: p.Format,
|
|
ACLs: p.ACLs,
|
|
SELinux: p.SELinux,
|
|
Xattrs: p.Xattrs,
|
|
RootNode: p.RootNode,
|
|
}
|
|
tarStage := osbuild.NewTarStage(tarOptions, p.inputPipeline.Name())
|
|
pipeline.AddStage(tarStage)
|
|
|
|
return pipeline
|
|
}
|
|
|
|
func (p *Tar) getBuildPackages(Distro) []string {
|
|
return []string{"tar"}
|
|
}
|
|
|
|
func (p *Tar) Export() *artifact.Artifact {
|
|
p.Base.export = true
|
|
mimeType := "application/x-tar"
|
|
return artifact.New(p.Name(), p.Filename(), &mimeType)
|
|
}
|