Merge pull request #170 from sylabs/dependabot/go_modules/release-3.8/github.com/sylabs/sif-1.5.1

build(deps): bump github.com/sylabs/sif from 1.5.0 to 1.5.1

Author: dtrudg

go.mod

@@ -48,7 +48,7 @@ require (
 	github.com/sylabs/scs-build-client v0.1.6
 	github.com/sylabs/scs-key-client v0.6.2
 	github.com/sylabs/scs-library-client v1.0.5
-	github.com/sylabs/sif v1.5.0
+	github.com/sylabs/sif v1.5.1
 	github.com/urfave/cli v1.22.5 // indirect
 	github.com/vbauerster/mpb/v4 v4.12.2
 	github.com/vbauerster/mpb/v6 v6.0.4

go.sum

@@ -859,8 +859,8 @@ github.com/sylabs/scs-key-client v0.6.2 h1:PTdmkE50rFMrSty9usl8wnzaW+JPK0rjXF4cd
 github.com/sylabs/scs-key-client v0.6.2/go.mod h1:WoTk47nNRrk0uLfblxUFekxDIIVPY4l2/9evME5fgX0=
 github.com/sylabs/scs-library-client v1.0.5 h1:u8ueCIQaa38/B0axtKUzdWSQ6uLXL9HvLQGNkB69Oe0=
 github.com/sylabs/scs-library-client v1.0.5/go.mod h1:ufza0uq4ohT7Fk2Y7vm+uRyMm7gRA+Fde1nxyhGfhTk=
-github.com/sylabs/sif v1.5.0 h1:7jTKPcv9Y+HkoAw1nYXssFDtnkSrmUUIYWLBOR0GqUs=
-github.com/sylabs/sif v1.5.0/go.mod h1:7XfhyQDbVIQki/GftRt77khhBvYTOCzPMMI62ZT4Ya8=
+github.com/sylabs/sif v1.5.1 h1:DtnvtQY/NABQx2H7PlCij57L+67fTuG7d2MQJpbeeO8=
+github.com/sylabs/sif v1.5.1/go.mod h1:7XfhyQDbVIQki/GftRt77khhBvYTOCzPMMI62ZT4Ya8=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=

internal/app/singularity/plugin_compile_linux.go

@@ -313,10 +313,15 @@ func makeSIF(sourceDir, sifPath string) error {
 	os.RemoveAll(sifPath)
 
 	// create sif file
-	if _, err := sif.CreateContainer(plCreateInfo); err != nil {
+	f, err := sif.CreateContainer(plCreateInfo)
+	if err != nil {
 		return fmt.Errorf("while creating sif file: %s", err)
 	}
 
+	if err := f.UnloadContainer(); err != nil {
+		return fmt.Errorf("while unloading sif file: %w", err)
+	}
+
 	return nil
 }
 

internal/pkg/build/assemblers/sif.go

@@ -157,10 +157,15 @@ func createSIF(path string, b *types.Bundle, squashfile string, encOpts *encrypt
 	os.RemoveAll(path)
 
 	// test container creation with two partition input descriptors
-	if _, err := sif.CreateContainer(cinfo); err != nil {
+	f, err := sif.CreateContainer(cinfo)
+	if err != nil {
 		return fmt.Errorf("while creating container: %s", err)
 	}
 
+	if err := f.UnloadContainer(); err != nil {
+		return fmt.Errorf("while unloading container: %w", err)
+	}
+
 	// chown the sif file to the calling user
 	if uid, gid, ok := changeOwner(); ok {
 		if err := os.Chown(path, uid, gid); err != nil {