publicWagsHome
/
buildx
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bake: print default group

Browse Source 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
pull/720/head
CrazyMax 3 years ago
parent cd133cee25
commit c685e46609
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
4 changed files with 110 additions and 19 deletions
Show Stats Download Patch File Download Diff File

10
bake/bake.go
Unescape Escape View File

@ -61,29 +61,29 @@ func ReadLocalFiles(names []string) ([]File, error) {
return out, nil return out, nil
} }
func ReadTargets(ctx context.Context, files []File, targets, overrides []string, defaults map[string]string) (map[string]*Target, error) { func ReadTargets(ctx context.Context, files []File, targets, overrides []string, defaults map[string]string) (map[string]*Target, []*Group, error) {
c, err := ParseFiles(files, defaults) c, err := ParseFiles(files, defaults)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
o, err := c.newOverrides(overrides) o, err := c.newOverrides(overrides)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
m := map[string]*Target{} m := map[string]*Target{}
for _, n := range targets { for _, n := range targets {
for _, n := range c.ResolveGroup(n) { for _, n := range c.ResolveGroup(n) {
t, err := c.ResolveTarget(n, o) t, err := c.ResolveTarget(n, o)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
if t != nil { if t != nil {
m[n] = t m[n] = t
} }
} }
} }
return m, nil return m, c.Groups, nil
} }
func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error) { func ParseFiles(files []File, defaults map[string]string) (_ *Config, err error) {

22
bake/bake_test.go
Unescape Escape View File

@ -34,7 +34,7 @@ target "webapp" {
ctx := context.TODO() ctx := context.TODO()
t.Run("NoOverrides", func(t *testing.T) { t.Run("NoOverrides", func(t *testing.T) {
m, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, nil, nil) m, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, nil, nil)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 1, len(m)) require.Equal(t, 1, len(m))
@ -46,7 +46,7 @@ target "webapp" {
}) })
t.Run("InvalidTargetOverrides", func(t *testing.T) { t.Run("InvalidTargetOverrides", func(t *testing.T) {
_, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"nosuchtarget.context=foo"}, nil) _, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"nosuchtarget.context=foo"}, nil)
require.NotNil(t, err) require.NotNil(t, err)
require.Equal(t, err.Error(), "could not find any target matching 'nosuchtarget'") require.Equal(t, err.Error(), "could not find any target matching 'nosuchtarget'")
}) })
@ -56,7 +56,7 @@ target "webapp" {
os.Setenv("VAR_FROMENV"+t.Name(), "fromEnv") os.Setenv("VAR_FROMENV"+t.Name(), "fromEnv")
defer os.Unsetenv("VAR_FROM_ENV" + t.Name()) defer os.Unsetenv("VAR_FROM_ENV" + t.Name())
m, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{ m, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{
"webapp.args.VAR_UNSET", "webapp.args.VAR_UNSET",
"webapp.args.VAR_EMPTY=", "webapp.args.VAR_EMPTY=",
"webapp.args.VAR_SET=bananas", "webapp.args.VAR_SET=bananas",
@ -85,7 +85,7 @@ target "webapp" {
// building leaf but overriding parent fields // building leaf but overriding parent fields
t.Run("parent", func(t *testing.T) { t.Run("parent", func(t *testing.T) {
m, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{ m, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{
"webDEP.args.VAR_INHERITED=override", "webDEP.args.VAR_INHERITED=override",
"webDEP.args.VAR_BOTH=override", "webDEP.args.VAR_BOTH=override",
}, nil) }, nil)
@ -96,23 +96,23 @@ target "webapp" {
}) })
t.Run("ContextOverride", func(t *testing.T) { t.Run("ContextOverride", func(t *testing.T) {
_, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.context"}, nil) _, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.context"}, nil)
require.NotNil(t, err) require.NotNil(t, err)
m, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.context=foo"}, nil) m, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.context=foo"}, nil)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "foo", *m["webapp"].Context) require.Equal(t, "foo", *m["webapp"].Context)
}) })
t.Run("NoCacheOverride", func(t *testing.T) { t.Run("NoCacheOverride", func(t *testing.T) {
m, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.no-cache=false"}, nil) m, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.no-cache=false"}, nil)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, false, *m["webapp"].NoCache) require.Equal(t, false, *m["webapp"].NoCache)
}) })
t.Run("PullOverride", func(t *testing.T) { t.Run("PullOverride", func(t *testing.T) {
m, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.pull=false"}, nil) m, _, err := ReadTargets(ctx, []File{fp}, []string{"webapp"}, []string{"webapp.pull=false"}, nil)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, false, *m["webapp"].Pull) require.Equal(t, false, *m["webapp"].Pull)
}) })
@ -172,7 +172,7 @@ target "webapp" {
} }
for _, test := range cases { for _, test := range cases {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
m, err := ReadTargets(ctx, []File{fp}, test.targets, test.overrides, nil) m, _, err := ReadTargets(ctx, []File{fp}, test.targets, test.overrides, nil)
test.check(t, m, err) test.check(t, m, err)
}) })
} }
@ -215,7 +215,7 @@ services:
ctx := context.TODO() ctx := context.TODO()
m, err := ReadTargets(ctx, []File{fp, fp2}, []string{"default"}, nil, nil) m, _, err := ReadTargets(ctx, []File{fp, fp2}, []string{"default"}, nil, nil)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 3, len(m)) require.Equal(t, 3, len(m))
@ -238,7 +238,7 @@ func TestHCLCwdPrefix(t *testing.T) {
}`), }`),
} }
ctx := context.TODO() ctx := context.TODO()
m, err := ReadTargets(ctx, []File{fp}, []string{"app"}, nil, nil) m, _, err := ReadTargets(ctx, []File{fp}, []string{"app"}, nil, nil)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, 1, len(m)) require.Equal(t, 1, len(m))

27
commands/bake.go
Unescape Escape View File

@ -36,6 +36,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
}() }()
var url string var url string
var noTarget bool
cmdContext := "cwd://" cmdContext := "cwd://"
if len(targets) > 0 { if len(targets) > 0 {
@ -54,6 +55,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
if len(targets) == 0 { if len(targets) == 0 {
targets = []string{"default"} targets = []string{"default"}
noTarget = true
} }
overrides := in.overrides overrides := in.overrides
@ -103,7 +105,7 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
return err return err
} }
m, err := bake.ReadTargets(ctx, files, targets, overrides, map[string]string{ t, g, err := bake.ReadTargets(ctx, files, targets, overrides, map[string]string{
"BAKE_CMD_CONTEXT": cmdContext, "BAKE_CMD_CONTEXT": cmdContext,
}) })
if err != nil { if err != nil {
@ -111,13 +113,32 @@ func runBake(dockerCli command.Cli, targets []string, in bakeOptions) (err error
} }
// this function can update target context string from the input so call before printOnly check // this function can update target context string from the input so call before printOnly check
bo, err := bake.TargetsToBuildOpt(m, inp) bo, err := bake.TargetsToBuildOpt(t, inp)
if err != nil { if err != nil {
return err return err
} }
if in.printOnly { if in.printOnly {
dt, err := json.MarshalIndent(map[string]map[string]*bake.Target{"target": m}, "", " ") defGroup := map[string][]string{
"default": targets,
}
if noTarget {
for _, group := range g {
if group.Name != "default" {
continue
}
defGroup = map[string][]string{
"default": group.Targets,
}
}
}
dt, err := json.MarshalIndent(struct {
Group map[string][]string `json:"group,omitempty"`
Target map[string]*bake.Target `json:"target"`
}{
defGroup,
t,
}, "", " ")
if err != nil { if err != nil {
return err return err
} }

70
docs/reference/buildx_bake.md
Unescape Escape View File

@ -100,6 +100,11 @@ $ docker buildx bake "git://github.com/docker/cli#master" --print
#1 0.686 2776a6d694f988c0c1df61cad4bfac0f54e481c8 refs/heads/master #1 0.686 2776a6d694f988c0c1df61cad4bfac0f54e481c8 refs/heads/master
#1 CACHED #1 CACHED
{ {
"group": {
"default": [
"binary"
]
},
"target": { "target": {
"binary": { "binary": {
"context": "git://github.com/docker/cli#master", "context": "git://github.com/docker/cli#master",
@ -144,6 +149,11 @@ EOT
```console ```console
$ docker buildx bake "git://github.com/tonistiigi/buildx#remote-test" --print $ docker buildx bake "git://github.com/tonistiigi/buildx#remote-test" --print
{ {
"group": {
"default": [
"default"
]
},
"target": { "target": {
"default": { "default": {
"context": ".", "context": ".",
@ -171,6 +181,11 @@ $ docker buildx bake "git://github.com/tonistiigi/buildx#remote-test" "git://git
#1 0.401 577303add004dd7efeb13434d69ea030d35f7888 refs/heads/remote-test #1 0.401 577303add004dd7efeb13434d69ea030d35f7888 refs/heads/remote-test
#1 CACHED #1 CACHED
{ {
"group": {
"default": [
"default"
]
},
"target": { "target": {
"default": { "default": {
"context": "git://github.com/docker/cli#master", "context": "git://github.com/docker/cli#master",
@ -209,6 +224,11 @@ format, without starting a build.
```console ```console
$ docker buildx bake -f docker-bake.hcl --print db $ docker buildx bake -f docker-bake.hcl --print db
{ {
"group": {
"default": [
"db"
]
},
"target": { "target": {
"db": { "db": {
"context": "./", "context": "./",
@ -347,6 +367,11 @@ You can use this file directly:
```console ```console
$ docker buildx bake --print app $ docker buildx bake --print app
{ {
"group": {
"default": [
"app"
]
},
"target": { "target": {
"app": { "app": {
"context": ".", "context": ".",
@ -372,6 +397,11 @@ And invoke bake together with both of the files:
```console ```console
$ docker buildx bake -f docker-bake.hcl -f env.hcl --print app $ docker buildx bake -f docker-bake.hcl -f env.hcl --print app
{ {
"group": {
"default": [
"app"
]
},
"target": { "target": {
"app": { "app": {
"context": ".", "context": ".",
@ -419,6 +449,11 @@ target "webapp" {
```console ```console
$ docker buildx bake --print webapp $ docker buildx bake --print webapp
{ {
"group": {
"default": [
"webapp"
]
},
"target": { "target": {
"webapp": { "webapp": {
"context": ".", "context": ".",
@ -434,6 +469,11 @@ $ docker buildx bake --print webapp
```console ```console
$ TAG=$(git rev-parse --short HEAD) docker buildx bake --print webapp $ TAG=$(git rev-parse --short HEAD) docker buildx bake --print webapp
{ {
"group": {
"default": [
"webapp"
]
},
"target": { "target": {
"webapp": { "webapp": {
"context": ".", "context": ".",
@ -471,6 +511,11 @@ target "webapp" {
```console ```console
$ docker buildx bake --print webapp $ docker buildx bake --print webapp
{ {
"group": {
"default": [
"webapp"
]
},
"target": { "target": {
"webapp": { "webapp": {
"context": ".", "context": ".",
@ -509,6 +554,11 @@ target "webapp" {
```console ```console
$ docker buildx bake --print webapp $ docker buildx bake --print webapp
{ {
"group": {
"default": [
"webapp"
]
},
"target": { "target": {
"webapp": { "webapp": {
"context": ".", "context": ".",
@ -549,6 +599,11 @@ target "webapp" {
```console ```console
$ docker buildx bake --print webapp $ docker buildx bake --print webapp
{ {
"group": {
"default": [
"webapp"
]
},
"target": { "target": {
"webapp": { "webapp": {
"context": ".", "context": ".",
@ -585,6 +640,11 @@ target "webapp" {
```console ```console
$ docker buildx bake --print webapp $ docker buildx bake --print webapp
{ {
"group": {
"default": [
"webapp"
]
},
"target": { "target": {
"webapp": { "webapp": {
"context": ".", "context": ".",
@ -635,6 +695,11 @@ target "app" {
```console ```console
$ docker buildx bake -f docker-bake1.hcl -f docker-bake2.hcl --print app $ docker buildx bake -f docker-bake1.hcl -f docker-bake2.hcl --print app
{ {
"group": {
"default": [
"app"
]
},
"target": { "target": {
"app": { "app": {
"context": ".", "context": ".",
@ -674,6 +739,11 @@ target "app" {
```console ```console
$ docker buildx bake --print app $ docker buildx bake --print app
{ {
"group": {
"default": [
"app"
]
},
"target": { "target": {
"app": { "app": {
"context": ".", "context": ".",

Write Preview
Loading…
Cancel
Save