diff --git a/cmd/convertor/builder/overlaybd_builder.go b/cmd/convertor/builder/overlaybd_builder.go index ad70a546..217a2aab 100644 --- a/cmd/convertor/builder/overlaybd_builder.go +++ b/cmd/convertor/builder/overlaybd_builder.go @@ -59,9 +59,12 @@ func NewOverlayBDBuilderEngine(base *builderEngineBase) builderEngine { Lowers: []snapshot.OverlayBDBSConfigLower{}, ResultFile: "", } - config.Lowers = append(config.Lowers, snapshot.OverlayBDBSConfigLower{ - File: overlaybdBaseLayer, - }) + if !base.mkfs { + config.Lowers = append(config.Lowers, snapshot.OverlayBDBSConfigLower{ + File: overlaybdBaseLayer, + }) + logrus.Infof("using default baselayer") + } overlaybdLayers := make([]overlaybdConvertResult, len(base.manifest.Layers)) @@ -295,6 +298,7 @@ func (e *overlaybdBuilderEngine) create(ctx context.Context, dir string, mkfs bo opts := []string{"-s", "64"} if mkfs { opts = append(opts, "--mkfs") + logrus.Infof("mkfs for baselayer") } return utils.Create(ctx, dir, opts...) } diff --git a/cmd/convertor/builder/turboOCI_builder.go b/cmd/convertor/builder/turboOCI_builder.go index 883681ad..8a6dbc29 100644 --- a/cmd/convertor/builder/turboOCI_builder.go +++ b/cmd/convertor/builder/turboOCI_builder.go @@ -32,6 +32,7 @@ import ( "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + "github.com/sirupsen/logrus" ) const ( @@ -60,9 +61,12 @@ func NewTurboOCIBuilderEngine(base *builderEngineBase) builderEngine { Lowers: []snapshot.OverlayBDBSConfigLower{}, ResultFile: "", } - config.Lowers = append(config.Lowers, snapshot.OverlayBDBSConfigLower{ - File: overlaybdBaseLayer, - }) + if !base.mkfs { + config.Lowers = append(config.Lowers, snapshot.OverlayBDBSConfigLower{ + File: overlaybdBaseLayer, + }) + logrus.Infof("using default baselayer") + } return &turboOCIBuilderEngine{ builderEngineBase: base, overlaybdConfig: config,