Skip to content

agentfs: use forward slashes in Dockerfile entrypoint paths on Windows #842

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

Open
c-tonneslan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

agentfs: use forward slashes in Dockerfile entrypoint paths on Windows #842

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions pkg/agentfs/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ func validateEntrypoint(dir string, dockerfileContent []byte, dockerignoreConten
}

var fileList []string
if err := filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error {
if err := filepath.WalkDir(dir, func(p string, d os.DirEntry, err error) error {
if err != nil {
return err
}
if ignored, err := matcher.MatchesOrParentMatches(path); ignored {
if ignored, err := matcher.MatchesOrParentMatches(p); ignored {
return nil
} else if err != nil {
return err
Expand All @@ -148,7 +148,13 @@ func validateEntrypoint(dir string, dockerfileContent []byte, dockerignoreConten
if strings.HasPrefix(d.Name(), "__") && d.Name() != "__main__.py" {
return nil
}
fileList = append(fileList, path)
// Make relative to dir and use forward slashes so paths are valid inside
// the Linux-based Docker container regardless of the host OS.
rel, err := filepath.Rel(dir, p)
if err != nil {
return err
}
fileList = append(fileList, filepath.ToSlash(rel))
}
return nil
}); err != nil {
Expand Down Expand Up @@ -199,7 +205,7 @@ func validateEntrypoint(dir string, dockerfileContent []byte, dockerignoreConten
if err := form.Run(); err != nil {
return nil, err
}
newEntrypoint = util.ToUnixPath(selected)
newEntrypoint = selected
}

fmt.Printf("Using entrypoint file [%s]\n", util.Accented(newEntrypoint))
Expand Down