bake: fix parsing target from compose files

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2019-04-25 21:36:28 -07:00
parent d5a84b1593
commit 43356bbbbe
2 changed files with 22 additions and 1 deletions

View File

@ -53,7 +53,8 @@ func ParseCompose(dt []byte) (*Config, error) {
// TODO: add platforms // TODO: add platforms
} }
if s.Build.Target != "" { if s.Build.Target != "" {
t.Target = &s.Build.Target target := s.Build.Target
t.Target = &target
} }
if s.Image != "" { if s.Image != "" {
t.Tags = []string{s.Image} t.Tags = []string{s.Image}

View File

@ -39,3 +39,23 @@ services:
require.Equal(t, 1, len(c.Target["webapp"].Args)) require.Equal(t, 1, len(c.Target["webapp"].Args))
require.Equal(t, "123", c.Target["webapp"].Args["buildno"]) require.Equal(t, "123", c.Target["webapp"].Args["buildno"])
} }
func TestParseComposeTarget(t *testing.T) {
var dt = []byte(`
version: "3.7"
services:
db:
build:
target: db
webapp:
build:
target: webapp
`)
c, err := ParseCompose(dt)
require.NoError(t, err)
require.Equal(t, "db", *c.Target["db"].Target)
require.Equal(t, "webapp", *c.Target["webapp"].Target)
}