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>
3 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
Justin Chadwell