overlay: pass diffOutput to generateComposeFsBlob

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
containers · Jul 6, 2023 · 4f9add7 · 4f9add7
1 parent 4731f0f
commit 4f9add7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/drivers/overlay/composefs_notsupported.go b/drivers/overlay/composefs_notsupported.go
@@ -5,13 +5,15 @@ package overlay
 
 import (
 	"fmt"
+
+	graphdriver "github.com/containers/storage/drivers"
 )
 
 func composeFsSupported() bool {
 	return false
 }
 
-func generateComposeFsBlob(toc []byte, composefsDir string) error {
+func generateComposeFsBlob(toc []byte, composefsDir string, diffOutput *graphdriver.DriverWithDifferOutput) error {
 	return fmt.Errorf("composefs is not supported")
 }
 

diff --git a/drivers/overlay/composefs_supported.go b/drivers/overlay/composefs_supported.go
@@ -15,6 +15,7 @@ import (
 	"syscall"
 	"unsafe"
 
+	graphdriver "github.com/containers/storage/drivers"
 	"github.com/containers/storage/pkg/loopback"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
@@ -79,7 +80,7 @@ func getErofsBlob(dataDir string) string {
 	return filepath.Join(dataDir, "erofs.blob")
 }
 
-func generateComposeFsBlob(toc []byte, composefsDir string) error {
+func generateComposeFsBlob(toc []byte, composefsDir string, diffOutput *graphdriver.DriverWithDifferOutput) error {
 	_ = os.MkdirAll(composefsDir, 0o700)
 	destFile := getErofsBlob(composefsDir)
 	writerJson, err := getComposeFsHelper()

diff --git a/drivers/overlay/overlay.go b/drivers/overlay/overlay.go
@@ -2070,7 +2070,7 @@ func (d *Driver) ApplyDiffFromStagingDirectory(id, parent, stagingDirectory stri
 			logrus.Warningf("%s", err)
 		}
 		toc := diffOutput.BigData[zstdChunkedManifest]
-		if err := generateComposeFsBlob(toc, d.getComposefsData(id)); err != nil {
+		if err := generateComposeFsBlob(toc, d.getComposefsData(id), diffOutput); err != nil {
 			return err
 		}
 	}