Skip to content

Commit 45bd60c

Browse files
ndeloofglours
authored andcommitted
resolve symlinks while making dockerfile path absolute
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
1 parent cf89fd1 commit 45bd60c

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

pkg/compose/build_bake.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,15 @@ func dockerFilePath(ctxName string, dockerfile string) string {
420420
if dockerfile == "" {
421421
return ""
422422
}
423-
if urlutil.IsGitURL(ctxName) || filepath.IsAbs(dockerfile) {
423+
if urlutil.IsGitURL(ctxName) {
424424
return dockerfile
425425
}
426-
return filepath.Join(ctxName, dockerfile)
426+
if !filepath.IsAbs(dockerfile) {
427+
dockerfile = filepath.Join(ctxName, dockerfile)
428+
}
429+
symlinks, err := filepath.EvalSymlinks(dockerfile)
430+
if err == nil {
431+
return symlinks
432+
}
433+
return dockerfile
427434
}

0 commit comments

Comments
 (0)