From 413f46ade06ba2d40bed1f60ca1303a8610b545a Mon Sep 17 00:00:00 2001 From: Guillaume Lours Date: Mon, 15 Nov 2021 22:58:55 +0100 Subject: [PATCH] use Dockerfile directly when path is absolute otherwise join it with Context path Signed-off-by: Guillaume Lours --- pkg/compose/build.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/compose/build.go b/pkg/compose/build.go index 9d3c2aa05..731088339 100644 --- a/pkg/compose/build.go +++ b/pkg/compose/build.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "os" + "path" "path/filepath" "github.com/compose-spec/compose-go/types" @@ -246,7 +247,7 @@ func (s *composeService) toBuildOptions(project *types.Project, service types.Se return build.Options{ Inputs: build.Inputs{ ContextPath: service.Build.Context, - DockerfilePath: filepath.Join(service.Build.Context, service.Build.Dockerfile), + DockerfilePath: dockerFilePath(service.Build.Context, service.Build.Dockerfile), }, BuildArgs: buildArgs, Tags: tags, @@ -285,3 +286,10 @@ func mergeArgs(m ...types.Mapping) types.Mapping { } return merged } + +func dockerFilePath(context string, dockerfile string) string { + if path.IsAbs(dockerfile) { + return dockerfile + } + return filepath.Join(context, dockerfile) +}