diff --git a/pkg/compiler/artifact_test.go b/pkg/compiler/artifact_test.go index de653fde..cbd6d82e 100644 --- a/pkg/compiler/artifact_test.go +++ b/pkg/compiler/artifact_test.go @@ -112,16 +112,19 @@ RUN echo bar > /test2`)) diffs, err := b.Changes(filepath.Join(tmpdir2, "output1.tar"), filepath.Join(tmpdir, "output2.tar")) Expect(err).ToNot(HaveOccurred()) + artifacts := []ArtifactNode{} + if os.Getenv("DOCKER_BUILDKIT") != "" { + artifacts = append(artifacts, ArtifactNode{Name: "/etc/resolv.conf", Size: 0}) + } + artifacts = append(artifacts, ArtifactNode{Name: "/test", Size: 4}) + artifacts = append(artifacts, ArtifactNode{Name: "/test2", Size: 4}) + Expect(diffs).To(Equal( []ArtifactLayer{{ FromImage: filepath.Join(tmpdir2, "output1.tar"), ToImage: filepath.Join(tmpdir, "output2.tar"), Diffs: ArtifactDiffs{ - Additions: []ArtifactNode{ - {Name: "/etc/resolv.conf", Size: 0}, - {Name: "/test", Size: 4}, - {Name: "/test2", Size: 4}, - }, + Additions: artifacts, }, }})) err = b.ExtractRootfs(CompilerBackendOptions{SourcePath: filepath.Join(tmpdir, "output2.tar"), Destination: rootfs}, false) diff --git a/pkg/compiler/backend/simpledocker_test.go b/pkg/compiler/backend/simpledocker_test.go index 3c66de51..dd6c9af0 100644 --- a/pkg/compiler/backend/simpledocker_test.go +++ b/pkg/compiler/backend/simpledocker_test.go @@ -101,15 +101,19 @@ RUN echo bar > /test2`)) Expect(b.ImageDefinitionToTar(opts)).ToNot(HaveOccurred()) Expect(helpers.Exists(filepath.Join(tmpdir, "output2.tar"))).To(BeTrue()) + artifacts := []ArtifactNode{} + if os.Getenv("DOCKER_BUILDKIT") != "" { + artifacts = append(artifacts, ArtifactNode{Name: "/etc/resolv.conf", Size: 0}) + } + artifacts = append(artifacts, ArtifactNode{Name: "/test", Size: 4}) + artifacts = append(artifacts, ArtifactNode{Name: "/test2", Size: 4}) + Expect(b.Changes(filepath.Join(tmpdir2, "output1.tar"), filepath.Join(tmpdir, "output2.tar"))).To(Equal( []ArtifactLayer{{ FromImage: filepath.Join(tmpdir2, "output1.tar"), ToImage: filepath.Join(tmpdir, "output2.tar"), Diffs: ArtifactDiffs{ - Additions: []ArtifactNode{ - {Name: "/test", Size: 4}, - {Name: "/test2", Size: 4}, - }, + Additions: artifacts, }, }}))