625b1578fa
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>
52 lines
1.6 KiB
Go
52 lines
1.6 KiB
Go
package graphdriver
|
|
|
|
import (
|
|
"github.com/containers/storage/pkg/idtools"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// TemplateDriver is just barely enough of a driver that we can implement a
|
|
// naive version of CreateFromTemplate on top of it.
|
|
type TemplateDriver interface {
|
|
DiffDriver
|
|
CreateReadWrite(id, parent string, opts *CreateOpts) error
|
|
Create(id, parent string, opts *CreateOpts) error
|
|
Remove(id string) error
|
|
}
|
|
|
|
// CreateFromTemplate creates a layer with the same contents and parent as
|
|
// another layer. Internally, it may even depend on that other layer
|
|
// continuing to exist, as if it were actually a child of the child layer.
|
|
func NaiveCreateFromTemplate(d TemplateDriver, id, template string, templateIDMappings *idtools.IDMappings, parent string, parentIDMappings *idtools.IDMappings, opts *CreateOpts, readWrite bool) error {
|
|
var err error
|
|
if readWrite {
|
|
err = d.CreateReadWrite(id, parent, opts)
|
|
} else {
|
|
err = d.Create(id, parent, opts)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
diff, err := d.Diff(template, templateIDMappings, parent, parentIDMappings, opts.MountLabel)
|
|
if err != nil {
|
|
if err2 := d.Remove(id); err2 != nil {
|
|
logrus.Errorf("Removing layer %q: %v", id, err2)
|
|
}
|
|
return err
|
|
}
|
|
defer diff.Close()
|
|
|
|
applyOptions := ApplyDiffOpts{
|
|
Diff: diff,
|
|
Mappings: templateIDMappings,
|
|
MountLabel: opts.MountLabel,
|
|
IgnoreChownErrors: opts.ignoreChownErrors,
|
|
}
|
|
if _, err = d.ApplyDiff(id, parent, applyOptions); err != nil {
|
|
if err2 := d.Remove(id); err2 != nil {
|
|
logrus.Errorf("Removing layer %q: %v", id, err2)
|
|
}
|
|
return err
|
|
}
|
|
return nil
|
|
}
|