7ef679d945
bake(compose): allow dot in target name
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2 years ago
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>
3 years ago
11c1e03e93
Merge pull request #1155 from crazy-max/compose-cacheto
...
bake: support compose build cache_to
3 years ago
691723f9f9
bake: add timestamp function
...
Terraform includes a timestamp function to get the current time. go-cty
has imported a number of the timestamp functions to it's standard
library, however, this was one was not included.
This patch simply pulls in the TimestampFunc from Terraform's
internal/lang/funcs/datetime.go to allow easily fetching the current
time in bake.
Signed-off-by: Justin Chadwell <me@jedevc.com>
3 years ago
5b452b72a2
Merge pull request #1198 from jedevc/bump-buildkit-f4eb826
...
Bump buildkit to master branch
3 years ago
27fcb73c7c
bake: add tests for missing attributes in userfuncs
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
3 years ago
2aa22597f0
bake: forbid empty result and params in userfuncs
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
3 years ago
3b4780ef19
vendor: bump buildkit to master
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
3 years ago
12fde33d9b
bake: dedup compose main and extension fields values
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
a0f92829a7
bake: merge cache-from field from compose and x-bake
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
b438032a60
bake: support compose build cache_to
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
5ce3909c48
bake: fix compose consistency check
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
432c2b2650
bake: better handling of compose extension interface
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
91fec23f5d
Merge pull request #1153 from crazy-max/update-compose-go
...
bake: support compose build tags and secrets env
3 years ago
6cb1b85d7b
bake: support compose build tags
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
e0350f671a
bake: support compose secrets env
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
1807cfdd26
docs: changes to bake file definition guide
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
1cb1ee018b
build: enhance warning message when no output specified
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
03885ec9f1
hclparser: strip out blocks for json files
...
Body.JustAttributes cannot distinguish between blocks and attributes for
JSON files, so the variable block could be included in the list of
attributes returned.
This patch ensures that JSON and HCL files behave the same way by
removing all known block types first, from the provided config schema
and then from a generated definitions schema.
Fixes #1051
Signed-off-by: Justin Chadwell <me@jedevc.com>
3 years ago
6a702ebe5b
Merge pull request #1025 from crazy-max/bake-merge-jsons
...
bake: merge targets and vars from multiple JSON files
3 years ago
c0f8a8314b
bake: support compose build secrets
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
cad7ed68be
bake: merge vars from multiple JSON files
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
c317ca1e95
bake: merge targets from multiple JSON files
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
243b428a58
compose: add test for port mapping
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
0b8dde1071
bake: fix skipped group when already visited by another one
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
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>
3 years ago
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>
3 years ago
280c008f81
bake: make named contexts relative to remote bake input
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
3 years ago
32f6358d78
bake: add no-cache-filter
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
3 years ago
0fc2b5ca85
bake: add named contexts keys
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
3 years ago
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>
3 years ago
0044c28b1f
bake: keep target inheritance
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
5d715ada96
compose: resolve build args from service environment
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
3400fa5628
compose: test env_file
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
d95ebef55c
bake: fix group resolution
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
33c121df01
Merge pull request #881 from crazy-max/fix-bake-print
...
bake: fix groups print
3 years ago
4466a24f9e
bake: fix groups print
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
ec9daba87e
bake: ignore NetworkMode field for json and hcl
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
7371dda7a2
Merge pull request #863 from zachary-povey/support_host_network_in_compose
...
Add NetworkMode to bake target
3 years ago
7f8dbf890d
Remove support for network override in bake
...
Signed-off-by: Zachary Povey <zachary.povey@autotrader.co.uk>
3 years ago
4ee7f70400
Remove NetworkMode support for HCL targets
...
Signed-off-by: Zachary Povey <zachary.povey@autotrader.co.uk>
3 years ago
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>
3 years ago
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>
3 years ago
316ca972b6
bake: fix print output
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
82b212bddf
bake: fix protocol detection
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
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>
3 years ago
0e4d7aa7a9
bake: add test for merging overrides
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
3 years ago
6fc906532b
bake: fix using push override with output definition
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
3 years ago
422ba60b04
use long-running context for client initialization
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
3 years ago
cb185f095f
Merge pull request #721 from crazy-max/compose-ext
...
bake: `x-bake` extension field with compose
3 years ago
89e126fa60
bake: `x-bake` extension field with compose
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
c685e46609
bake: print default group
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 years ago
9aa8f09f14
Set `ConfigFile` to parse compose files with bake
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
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>
4 years ago
ba443811e4
Use compose-spec parser
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
79433cef7a
bake: fix target merge between compose and hcl
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
c5eb8f58b4
bake: new hclparser package
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
03b7128b60
Merge pull request #575 from tonistiigi/user-func-vars
...
bake: allow user functions in variables and vice-versa
4 years ago
df7a318ec0
bake: allow user functions in variables and vice-versa
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
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>
4 years ago
eec843a325
include default ssh socket when given an ssh-based git url
...
Signed-off-by: Alex Couture-Beil <alex@earthly.dev>
4 years ago
83868a48b7
temp local copy of userfunc
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
f036bba48c
bake: add test for json vars and attributes
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
0fe2ce7fac
bake: allow attributes in global scope
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
33f25acb08
bake: allow variables to reference each other
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
0e9066f6ed
bake: fix hcl tests layout
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
0e9d6460db
bake: allow variables across files
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
dba79ba223
update lint to go1.16/golangci
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
7878f0c514
bake: allow variables in user functions
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
f1f464e364
Add setproduct function to the bake HCL
...
As explained in the following link, it's a very useful function.
https://www.terraform.io/docs/configuration/functions/setproduct.html#finding-combinations-for-for_each
Signed-off-by: Felipe Santos <felipecassiors@gmail.com>
4 years ago
96e7f3224a
Extend hcl2 support with more functions
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
40fad4bbb5
progress: make sure all channels have written before returning
...
Possible write on closed channel on cancellation before.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
5bf2ff98c9
bake: support filenames without suffix
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
570e733a51
bake: support inline dockerfile
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
cffcd57edb
bake: support for remote files
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
abfb2c064d
Add support for empty strings in target elements and compact func.
...
Signed-off-by: Anthony Poschen <zanven42@gmail.com>
4 years ago
95ac9ebb8a
bake: format hcl errors with source definition
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
42448c5f37
Merge pull request #280 from vanstee/hcl-json-support
...
Support parsing json config with hcl v2
5 years ago
355261e49e
Parse bake config as hcl falling back to json
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
44c840b31d
Add test of parsing a json bake config
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
1bc068a583
Fix json keys for groups and targets
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
340686a383
Support parsing json config with hcl v2
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
1ad87c6ba6
Update go-cty to pull in more stdlib funcs.
...
I needed "split" specifically so I can do something like:
```hcl
variable PLATFORMS {
default = "linux/amd64"
}
target foo {
platforms = split(",", "${PLATFORMS}")
# other stuff
}
```
Where the existing "csvdecode" does not work for this because it parses
the string into a list of objects instead of a list of strings.
I went ahead and just added all the available new functions.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
5 years ago
77ddee9314
bake: fix pull and no-cache overrides
...
Signed-off-by: Tibor Vass <tibor@docker.com>
5 years ago
c9676c79d1
bake: fix hcl tags
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
5 years ago
870b38837b
Allow for user defined functions
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
abed97cf33
Include test cases of different hcl files
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
f10d8dab5e
Define variables as blocks with defaults
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
5185d534bc
Include go-cty stdlib functions in HCL file scope
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
a520de447e
Provide current env as variables in eval context
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
4121ae50b5
Modify parsing functions and config structs to accept hcl changes
...
Signed-off-by: Patrick Van Stee <patrick@vanstee.me>
5 years ago
2a257a8252
bake: allow overriding no-cache and pull per target via --set
...
Signed-off-by: Tibor Vass <tibor@docker.com>
5 years ago
078b65905a
bake: add test cases for pattern matching
...
Signed-off-by: Tibor Vass <tibor@docker.com>
5 years ago
2bca8fa677
bake: allow pattern matching for target names in --set
...
Although bake is for running multiple targets, --set required a single
target name for overriding a property. This change allows matching
multiple targets for overrides.
Signed-off-by: Tibor Vass <tibor@docker.com>
5 years ago
14e65ff3b4
bake: fix override+inheritance bug
...
Signed-off-by: Tibor Vass <tibor@docker.com>
5 years ago
3282dae09b
bake: add tests for override+inheritance bug
...
Signed-off-by: Tibor Vass <tibor@docker.com>
5 years ago
6634f1e75c
Support reading from env on bake --set <t>.args
...
This works just like the `build` command where if you have `--build-arg
FOO`, it will read the variable from env and only set a value if the
variable is defined.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
5 years ago
15a5a42eb1
bake: merge targets on same groups
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
5 years ago
8b2171f78a
bake: honor --no-cache and --pull
...
Signed-off-by: Tibor Vass <tibor@docker.com>
6 years ago
92f1234aaa
Merge pull request #116 from tonistiigi/build-arg-default
...
build: load default build args from env
6 years ago
CrazyMax