Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 16 additions & 10 deletions pkg/generate/dockerfile/finder.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,32 @@ func NewFinder() Finder {
return &finder{fsWalk: filepath.Walk}
}

// Find returns a list of of found Dockerfile(s) in the given directory
// Find returns the relative paths of Dockerfiles in the given directory dir.
func (f *finder) Find(dir string) ([]string, error) {
dockerfiles := []string{}
err := f.fsWalk(dir, func(path string, info os.FileInfo, err error) error {
if info == nil {
return nil
if err != nil {
return err
}
// Skip hidden directories
// Skip hidden directories.
if info.IsDir() && strings.HasPrefix(info.Name(), ".") {
return filepath.SkipDir
}

// Add files named Dockerfile
if info.Name() == "Dockerfile" && err == nil {
// Add relative path to Dockerfile.
if isDockerfile(info) {
relpath, err := filepath.Rel(dir, path)
if err == nil {
dockerfiles = append(dockerfiles, relpath)
if err != nil {
return err
}
dockerfiles = append(dockerfiles, relpath)
}
return err
return nil
})
return dockerfiles, err
}

// isDockerfile returns true if info looks like a Dockerfile. It must be named
// "Dockerfile" and be either a regular file or a symlink.
func isDockerfile(info os.FileInfo) bool {
return info.Name() == "Dockerfile" && (info.Mode().IsRegular() || info.Mode()&os.ModeSymlink != 0)
}
5 changes: 5 additions & 0 deletions pkg/generate/dockerfile/finder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ func TestFind(t *testing.T) {
path: "test/Dockerfile",
isDir: false,
},
{
name: "Dockerfile",
path: "test2/Dockerfile",
isDir: true,
},
{
name: ".hidden",
path: ".hidden",
Expand Down