docker/buildx
1
0
Fork 0
mirror of https://github.com/docker/buildx.git synced 2024-11-22 15:37:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,168 Commits 14 Branches 71 Tags 45 MiB
05efb6291f
Commit Graph

64 Commits

Author SHA1 Message Date
CrazyMax
e66410b932
Merge pull request #1313 from jedevc/bake-group-recurse 
bake: recursively resolve groups
 2022-11-25 11:27:09 +01:00
David Karlsson
be3b41acc6 docs: refactored file and directory structure 
Signed-off-by: David Karlsson <david.karlsson@docker.com>
 2022-11-04 19:57:50 +01:00
Justin Chadwell
77b33260f8 bake: recursively resolve groups 
Groups that contained other groups were not recursively resolved by
ReadTargets, which prevented output from --print from being useable as a
self-contained bake file.

This patch ensures that all groups that are referenced inside the bake
file are actually defined under the groups field. This has required a
substantial refactor, as previously only a single group was returned
from ReadTargets, notably, returning a map of groups, instead of a
slice.

This does introduce a small behavior change to the behavior of --print -
while previously, passing a group name to bake would return all the
targets of that group back as the default group, now only the name of
that group will be inserted into the default group, keeping the original
group intact. The impact of this can be observed in some of the changes
to the bake_test.go file.

Signed-off-by: Justin Chadwell <me@jedevc.com>
 2022-09-12 13:51:34 +01:00
CrazyMax
982a332679
bake(compose): fix unskipped services without build context 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-08-18 11:34:40 +02:00
CrazyMax
7d8a6bc1d7
bake: load .env file from working dir for compose files 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-08-10 03:24:38 +02:00
CrazyMax
7f572eb044
bake: contexts support with x-bake 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-08-05 15:21:26 +02:00
CrazyMax
7ef679d945
bake(compose): allow dot in target name 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-07-31 16:53:44 +02:00
CrazyMax
b0deb8bdd7
vendor: update docker/cli to f1615fa 
also needs to update docker/docker to a60b458 (22.06 branch) otherwise
build breaks since docker/cli#3512 with:

    # github.com/docker/cli/cli/flags
    vendor/github.com/docker/cli/cli/flags/common.go:40:37: undefined: client.EnvOverrideCertPath
    vendor/github.com/docker/cli/cli/flags/common.go:41:37: undefined: client.EnvTLSVerify
    vendor/github.com/docker/cli/cli/flags/common.go:89:76: undefined: client.EnvOverrideHost

needs also to update github.com/spf13/cobra to v1.5.0 otherwise
build breaks with:

    # github.com/docker/cli/cli-plugins/plugin
    vendor/github.com/docker/cli/cli-plugins/plugin/plugin.go:130:4: unknown field 'HiddenDefaultCmd' in struct literal of type cobra.CompletionOptions

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-07-22 10:53:37 +02:00
Justin Chadwell
3b4780ef19 vendor: bump buildkit to master 
Signed-off-by: Justin Chadwell <me@jedevc.com>
 2022-07-06 09:47:29 +01:00
CrazyMax
1807cfdd26
docs: changes to bake file definition guide 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-06-05 18:49:16 +02:00
CrazyMax
1cb1ee018b
build: enhance warning message when no output specified 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-06-03 19:26:21 +02:00
CrazyMax
0b8dde1071
bake: fix skipped group when already visited by another one 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-03-23 11:16:10 +01:00
Sebastiaan van Stijn
fc7ba75fd7
Remove uses of deprecated io/ioutil 
The package has been deprecated since Go 1.16: https://go.dev/doc/go1.16#ioutil

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-03-10 01:46:06 +01:00
Tonis Tiigi
91e550b715 bake: add path validation for remote bake invocations 
This is a stopgap before proper entitlements support
is implemented.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2022-02-24 23:19:18 -08:00
Tonis Tiigi
280c008f81 bake: make named contexts relative to remote bake input 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2022-02-24 23:19:12 -08:00
Tonis Tiigi
32f6358d78 bake: add no-cache-filter 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2022-02-10 22:01:48 -08:00
Tonis Tiigi
0fc2b5ca85 bake: add named contexts keys 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2022-01-27 18:46:02 -08:00
CrazyMax
c74b2fe7a4
bake: restrict target name 
This fix adds a restriction `[a-zA-Z0-9_-]+`
for target name. This is pretty much the same as the
container name restriction in moby.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-01-26 10:29:21 +01:00
CrazyMax
0044c28b1f
bake: keep target inheritance 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-01-13 22:23:20 +01:00
CrazyMax
d95ebef55c
bake: fix group resolution 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2021-12-14 11:17:37 +01:00
Tõnis Tiigi
33c121df01
Merge pull request #881 from crazy-max/fix-bake-print 
bake: fix groups print
 2021-12-13 16:09:24 -08:00
CrazyMax
4466a24f9e
bake: fix groups print 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2021-12-13 19:21:33 +01:00
CrazyMax
ec9daba87e
bake: ignore NetworkMode field for json and hcl 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2021-12-10 19:32:40 +01:00
Tõnis Tiigi
7371dda7a2
Merge pull request #863 from zachary-povey/support_host_network_in_compose 
Add NetworkMode to bake target
 2021-12-04 21:04:05 -08:00
Zachary Povey
7f8dbf890d Remove support for network override in bake 
Signed-off-by: Zachary Povey <zachary.povey@autotrader.co.uk>
 2021-12-01 09:45:32 +00:00
Zachary Povey
4ee7f70400 Remove NetworkMode support for HCL targets 
Signed-off-by: Zachary Povey <zachary.povey@autotrader.co.uk>
 2021-11-30 11:33:32 +00:00
Eliott Wiener
dcabc22072 bake: build definition file via stdin 
closes #833

Accept bake build definition file from stdin with `-f -`.

Signed-off-by: Eliott Wiener <eliottwiener@gmail.com>
 2021-11-25 12:43:38 -05:00
Zachary Povey
ae53101e89 Add NetworkMode to bake target 
Allows specification of network mode in a bake target.

Fixes #848

Signed-off-by: Zachary Povey <zachary.povey@autotrader.co.uk>
 2021-11-25 16:00:42 +00:00
CrazyMax
316ca972b6
bake: fix print output 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2021-11-24 21:54:57 +01:00
Tonis Tiigi
7a7b73c043 bake: restore previous override merge behavior 
For array fields, overrides are merged together
but override is not merged with the target. If merging
with target is desired we can add support for
overrides with += operator in the future.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-09-29 08:27:27 -07:00
Tonis Tiigi
6fc906532b bake: fix using push override with output definition 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-09-20 16:22:27 -07:00
CrazyMax
c685e46609
bake: print default group 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2021-08-12 09:02:36 +02:00
Tonis Tiigi
1bb425a882 bake: allow BAKE_CMD_CONTEXT builtin var 
Allows accessing the main context for bake command from bake
file that has been imported remotely.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-07-12 21:01:41 -07:00
Tonis Tiigi
c5eb8f58b4 bake: new hclparser package 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-06-24 22:40:25 -07:00
Tõnis Tiigi
03b7128b60
Merge pull request #575 from tonistiigi/user-func-vars 
bake: allow user functions in variables and vice-versa
 2021-06-23 11:08:56 -07:00
Tonis Tiigi
df7a318ec0 bake: allow user functions in variables and vice-versa 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-05-05 22:08:31 -07:00
Akihiro Suda
399df854ea
build: split buildflags package 
Planned to be imported by nerdctl in future.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-04-12 14:36:56 +09:00
Alex Couture-Beil
eec843a325 include default ssh socket when given an ssh-based git url 
Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
 2021-04-01 11:25:18 -07:00
Tonis Tiigi
33f25acb08 bake: allow variables to reference each other 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-03-07 21:27:30 -08:00
Tonis Tiigi
0e9d6460db bake: allow variables across files 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2021-02-25 16:30:27 -08:00
Tonis Tiigi
570e733a51 bake: support inline dockerfile 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2020-12-07 22:02:51 -08:00
Tonis Tiigi
cffcd57edb bake: support for remote files 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2020-12-07 22:02:51 -08:00
Anthony Poschen
abfb2c064d Add support for empty strings in target elements and compact func. 
Signed-off-by: Anthony Poschen <zanven42@gmail.com>
 2020-10-26 15:56:18 +11:00
Patrick Van Stee
1bc068a583
Fix json keys for groups and targets 
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
 2020-05-07 23:53:49 -04:00
Tibor Vass
77ddee9314 bake: fix pull and no-cache overrides 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2020-04-30 14:05:21 -07:00
Tonis Tiigi
c9676c79d1 bake: fix hcl tags 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2020-04-30 13:41:49 -07:00
Patrick Van Stee
870b38837b Allow for user defined functions 
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
 2020-04-29 08:52:48 -04:00
Patrick Van Stee
f10d8dab5e Define variables as blocks with defaults 
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
 2020-04-29 08:51:26 -04:00
Patrick Van Stee
4121ae50b5 Modify parsing functions and config structs to accept hcl changes 
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
 2020-04-29 08:51:26 -04:00
Tibor Vass
2a257a8252 bake: allow overriding no-cache and pull per target via --set 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2020-04-23 18:11:22 +00:00