19641ec8ca
Merge pull request #1214 from jedevc/timestamp-func
...
bake: add timestamp function
3 years ago
7ef679d945
bake(compose): allow dot in target name
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
3 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>
4 years ago
6a702ebe5b
Merge pull request #1025 from crazy-max/bake-merge-jsons
...
bake: merge targets and vars from multiple JSON files
4 years ago
c0f8a8314b
bake: support compose build secrets
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
cad7ed68be
bake: merge vars from multiple JSON files
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
c317ca1e95
bake: merge targets from multiple JSON files
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
243b428a58
compose: add test for port mapping
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
0b8dde1071
bake: fix skipped group when already visited by another one
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 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>
4 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>
4 years ago
280c008f81
bake: make named contexts relative to remote bake input
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
32f6358d78
bake: add no-cache-filter
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
0fc2b5ca85
bake: add named contexts keys
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 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>
4 years ago
0044c28b1f
bake: keep target inheritance
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
5d715ada96
compose: resolve build args from service environment
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
3400fa5628
compose: test env_file
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
d95ebef55c
bake: fix group resolution
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
33c121df01
Merge pull request #881 from crazy-max/fix-bake-print
...
bake: fix groups print
4 years ago
4466a24f9e
bake: fix groups print
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
ec9daba87e
bake: ignore NetworkMode field for json and hcl
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
7371dda7a2
Merge pull request #863 from zachary-povey/support_host_network_in_compose
...
Add NetworkMode to bake target
4 years ago
7f8dbf890d
Remove support for network override in bake
...
Signed-off-by: Zachary Povey <zachary.povey@autotrader.co.uk>
4 years ago
4ee7f70400
Remove NetworkMode support for HCL targets
...
Signed-off-by: Zachary Povey <zachary.povey@autotrader.co.uk>
4 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>
4 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>
4 years ago
316ca972b6
bake: fix print output
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 years ago
82b212bddf
bake: fix protocol detection
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
4 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>
4 years ago
0e4d7aa7a9
bake: add test for merging overrides
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
6fc906532b
bake: fix using push override with output definition
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
422ba60b04
use long-running context for client initialization
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
4 years ago
Tõnis Tiigi