docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-10 05:27:07 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

bake: fix dockerfile and context defaults

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2019-04-19 22:54:34 -07:00
parent 6e3dfe72cb
commit ef4afac948
6 changed files with 119 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bake/compose.go
View File

@ -34,9 +34,19 @@ func ParseCompose(dt []byte) (*Config, error) {
for _, s := range cfg.Services {
g.Targets = append(g.Targets, s.Name)
var contextPathP *string
if s.Build.Context != "" {
contextPath := s.Build.Context
contextPathP = &contextPath
}
var dockerfilePathP *string
if s.Build.Dockerfile != "" {
dockerfilePath := s.Build.Dockerfile
dockerfilePathP = &dockerfilePath
}
t := Target{
Context: s.Build.Context,
Dockerfile: s.Build.Dockerfile,
Context: contextPathP,
Dockerfile: dockerfilePathP,
Labels: s.Build.Labels,
Args: toMap(s.Build.Args),
CacheFrom: s.Build.CacheFrom,