kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-08 18:49:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔧 Drop containerd workaround

Browse Source 
Partly reverts
37cc186c0b,
but re-enable test.
This commit is contained in:
Ettore Di Giacinto
2022-01-04 16:56:08 +01:00
parent 80bc5429bc
commit 2bd623a61c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/core/image/delta_test.go
View File

@@ -78,6 +78,9 @@ var _ = Describe("Delta", func() {
) )
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
defer os.RemoveAll(tmpdir) // clean up defer os.RemoveAll(tmpdir) // clean up
// No extra dirs are present
Expect(file.Exists(filepath.Join(tmpdir, "home"))).To(BeFalse())
// Cache from go // Cache from go
Expect(file.Exists(filepath.Join(tmpdir, "root", ".cache"))).To(BeTrue()) Expect(file.Exists(filepath.Join(tmpdir, "root", ".cache"))).To(BeTrue())
// sh is present from alpine, hence not in the result // sh is present from alpine, hence not in the result

5
pkg/api/core/image/extract.go
View File

@@ -65,13 +65,8 @@ func ExtractDeltaAdditionsFiles(
return nil, err return nil, err
} }
switch hdr.Typeflag {
case tar.TypeDir:
filesSrc.Set(filepath.Dir(hdr.Name), "")
default:
filesSrc.Set(hdr.Name, "") filesSrc.Set(hdr.Name, "")
} }
}
return func(h *tar.Header) (bool, error) { return func(h *tar.Header) (bool, error) {