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

Change compose file handling to require valid service specifications

Browse Source 
Added the checks and some tests
One of the tests wasn't valid docker-compose.yml, that's been changed.
Bad config throws an error and has a test

Signed-off-by: Jack Laxson <jackjrabbit@gmail.com>
This commit is contained in:
Jack Laxson
2019-05-18 05:53:44 -04:00
committed by Tibor Vass
parent 61a6fdd767
commit 4b2666b9d6
3 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bake/compose.go
View File

@ -1,6 +1,8 @@
package bake
import (
"fmt"
"github.com/docker/cli/cli/compose/loader"
composetypes "github.com/docker/cli/cli/compose/types"
)
@ -33,7 +35,7 @@ func ParseCompose(dt []byte) (*Config, error) {
var g Group
for _, s := range cfg.Services {
g.Targets = append(g.Targets, s.Name)
var contextPathP *string
if s.Build.Context != "" {
contextPath := s.Build.Context
@ -44,6 +46,15 @@ func ParseCompose(dt []byte) (*Config, error) {
dockerfilePath := s.Build.Dockerfile
dockerfilePathP = &dockerfilePath
}
// Check if there's actually a dockerfile mentioned
if dockerfilePathP == nil && contextPathP == nil {
// if not make sure they're setting an image or it's invalid d-c.yml
if s.Image == "" {
return nil, fmt.Errorf("Compose file invalid: Service %s has neither an image nor a build context specified. At least one must be provided.", s.Name)
}
break
}
g.Targets = append(g.Targets, s.Name)
t := Target{
Context: contextPathP,
Dockerfile: dockerfilePathP,