tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 07:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support build.context with git URLs

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-03-19 10:10:35 +01:00
parent 3366131096
commit 4b1297ec71
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
local/compose/build.go
View File

@ -19,6 +19,7 @@ package compose
import ( import (
"context" "context"
"fmt" "fmt"
"net/url"
"os" "os"
"path" "path"
"strings" "strings"
@ -190,11 +191,22 @@ func (s *composeService) toBuildOptions(service types.ServiceConfig, contextPath
plats = append(plats, p) plats = append(plats, p)
} }
return build.Options{ var input build.Inputs
Inputs: build.Inputs{ _, err := url.ParseRequestURI(service.Build.Context)
if err == nil {
input = build.Inputs{
ContextPath: service.Build.Context,
DockerfilePath: service.Build.Dockerfile,
}
} else {
input = build.Inputs{
ContextPath: path.Join(contextPath, service.Build.Context), ContextPath: path.Join(contextPath, service.Build.Context),
DockerfilePath: path.Join(contextPath, service.Build.Context, service.Build.Dockerfile), DockerfilePath: path.Join(contextPath, service.Build.Context, service.Build.Dockerfile),
}, }
}
return build.Options{
Inputs: input,
BuildArgs: flatten(mergeArgs(service.Build.Args, buildArgs)), BuildArgs: flatten(mergeArgs(service.Build.Args, buildArgs)),
Tags: tags, Tags: tags,
Target: service.Build.Target, Target: service.Build.Target,