Skip to content

assume root-fs always exists #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mzihlmann wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

assume root-fs always exists #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c5bb21
assume root-fs always exists
mzihlmann Jul 6, 2025
5d96384
dont resolve links
mzihlmann Jul 11, 2025
283fe1e
tinker
mzihlmann Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions integration/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,29 @@ var diffArgsMap = map[string][]string{
"TestRun/test_Dockerfile_test_issue_mz155": {"--semantic=false", "--ignore-history", "--ignore-file-meta-format", "--ignore-file-atime", "--ignore-file-ctime", "--extra-ignore-files=tmp/"},
// We enforce predefined ARGs are identical by dumping them to a file
"TestRun/test_Dockerfile_test_pre_defined_build_args": {"--extra-ignore-file-content=false"},
// busybox ships without the standard dirs like [/proc, /sys].
// but they do get created on running the container. As a result,
// they always get snapshotted by docker. But they do pre-exist in kaniko context,
// so we can never snapshot them.
"TestRun/test_Dockerfile_test_arg_multi": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_arg_multi_with_quotes": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_daemons": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_mv_add": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_parent_dir_perms": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_registry": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_arg_blank_with_quotes": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_cache_perm_oci": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_complex_substitution": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_dangling_symlink": {"--extra-ignore-layer-length-mismatch"},
// "Check that overriding a default value works"
// produces a different output in kaniko and docker
"TestRun/test_Dockerfile_test_scratch": {"--extra-ignore-layer-length-mismatch"},
// COPY stores the files every-time, even if they were not changed
"TestRun/test_Dockerfile_test_copy_same_file_many_times": {"--extra-ignore-layer-length-mismatch"},
// somehow empty folders show up on our side but not buildkit
"TestRun/test_Dockerfile_test_issue_1039": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_issue_3393": {"--extra-ignore-layer-length-mismatch"},
"TestRun/test_Dockerfile_test_copy_chown_nonexisting_user": {"--extra-ignore-layer-length-mismatch"},
}

// output check to do when building with kaniko
Expand Down
2 changes: 1 addition & 1 deletion integration/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func TestRun(t *testing.T) {
dockerImage := GetDockerImage(config.imageRepo, dockerfile)
kanikoImage := GetKanikoImage(config.imageRepo, dockerfile)

containerDiff(t, daemonPrefix+dockerImage, kanikoImage, "--semantic", "--extra-ignore-file-content", "--extra-ignore-layer-length-mismatch")
containerDiff(t, daemonPrefix+dockerImage, kanikoImage, "--semantic", "--extra-ignore-file-content")
})
}

Expand Down
8 changes: 2 additions & 6 deletions pkg/snapshot/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,8 @@ func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) {
timer := timing.Start("Resolving Paths")

filesToAdd := []string{}
resolvedFiles, err := filesystem.ResolvePaths(changedPaths, s.ignorelist)
if err != nil {
return nil, nil, err
}
for _, path := range resolvedFiles {
if util.CheckIgnoreList(path) {
for _, path := range changedPaths {
if util.IsInProvidedIgnoreList(path, s.ignorelist) {
logrus.Debugf("Not adding %s to layer, as it's ignored", path)
continue
}
Expand Down
Loading