b1c5449428
builder: skip name validation for docker context
...
Although a builder from the store cannot be created unless
it has a valid name, this is not the case for a Docker context.
We should skip name validation when checking a node from the
store and fall back to finding one from Docker context instead.
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-14 14:19:30 +02:00
687feca9e8
Merge pull request #1877 from jedevc/cache-dockerutil-features
...
dockerutil: cache feature collection
2023-06-13 11:42:22 +02:00
d4a2c8d0c3
dockerutil: cache feature collection
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-13 09:47:38 +01:00
bef42b2441
Merge pull request #1876 from tonistiigi/remove-history-request
2023-06-13 09:38:05 +01:00
2de333fdd3
check history api support once
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-13 10:29:22 +02:00
1138789f20
avoid extra client for history API detection
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2023-06-12 17:39:09 -07:00
1f4ac09ffb
Merge pull request #1874 from thaJeztah/bump_engine_24.0.2
2023-06-09 11:39:13 +01:00
26a8ffb393
Merge pull request #1873 from jedevc/vendor-buildkit-master
...
vendor: update buildkit to master@67a08623b95a
2023-06-09 12:14:11 +02:00
9b7aada99b
Merge pull request #1716 from distorhead/use-docker-cli-in-stream
...
build(cli): allow passing in-stream using command.Cli
2023-06-09 12:11:47 +02:00
fd6207695b
vendor: github.com/docker/cli v24.0.2
...
no changes in vendored files
full diff: https://github.com/docker/cli/compare/v24.0.1...v24.0.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-06-09 12:07:44 +02:00
def96d2bf4
vendor: github.com/docker/docker v24.0.2
...
no changes in vendored files
full diff: https://github.com/docker/docker/compare/v24.0.1...v24.0.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-06-09 12:07:01 +02:00
f5f00e68ef
bake(cli): allow passing in-stream using command.Cli
...
ReadLocalFiles should allow passing the stdin file as an argument, which
allows us to read from dockerCli.Stdin() to be consistent with other
commands in the same package.
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-09 10:50:53 +01:00
14aebe713e
debug-shell(cli): allow passing in-stream using command.Cli
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-09 10:50:35 +01:00
9d2388e6f5
vendor: update buildkit to master@67a08623b95a
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-09 10:36:52 +01:00
75e2c46295
build(cli): allow passing in-stream using command.Cli
...
Use command.Cli::In() which is always initialized either to os.Stdin, or to user-specified stream:
* 5be21394cb/cli/command/cli.go (L494)https://github.com/docker/cli/blob/master/cli/command/cli_options.go#L16C1-L26
Signed-off-by: Timofey Kirillov <timofey.kirillov@flant.com>
2023-06-09 12:19:02 +03:00
2c02db8db4
Merge pull request #1835 from ktock/long-form-json
2023-06-08 17:10:37 +01:00
e304a05d2a
docs: monitor: mention about long form flag
...
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2023-06-08 17:05:03 +01:00
14c1ea0e11
invoke: Allow JSON array for long form flags
...
This commit allows specifying a JSON array to the long-form arg, entrypoint and
envvars.
Non-JSON-array value can still be specified. Buildx treats the value as a JSON
array only when it can be parsed as a JSON array.
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2023-06-08 17:05:02 +01:00
c30bcade2c
Merge pull request #1870 from tianon/invoke-entrypoint-fixes
2023-06-08 16:03:24 +01:00
62bfb19db4
Fix a couple `--invoke` entrypoint interaction bugs
...
When running `--invoke` against images that have `Cmd` set, the interactions with `Entrypoint` start to cause issues like the following:
/usr/local/bin/bash: /usr/local/bin/bash: cannot execute binary file
Or:
sh: can't open 'bash': No such file or directory
This patch fixes those by explicitly setting `Cmd` to be empty if it is unspecified and `Entrypoint` is being set, which matches `docker`'s behavior:
$ docker image inspect --format '{{ json .Config.Entrypoint }} + {{ json .Config.Cmd }}' bash
["docker-entrypoint.sh"] + ["bash"]
$ docker create --name foo --entrypoint bash bash
$ docker container inspect --format '{{ json .Config.Entrypoint }} + {{ json .Config.Cmd }}' foo
["bash"] + null
$ docker rm foo
$ docker create --name foo bash ls
$ docker container inspect --format '{{ json .Config.Entrypoint }} + {{ json .Config.Cmd }}' foo
["docker-entrypoint.sh"] + ["ls"]
(There are still some weird edge cases in the interaction between the `InvokeConfig` and the original image config, but this fixes the most irritating for me and the rest are going to be deeper changes that are possibly less acceptable. 😅 )
Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
2023-06-07 16:33:28 -07:00
47e34f2684
Merge pull request #1813 from jedevc/oci-export-on-containerd
2023-06-07 15:19:54 +02:00
3d981be4ad
Merge pull request #1850 from ktock/monitor-longhelp
2023-06-07 15:09:35 +02:00
5d94b0fcc7
Merge pull request #1866 from crazy-max/bump-compose
...
vendor: github.com/compose-spec/compose-go v1.14.0
2023-06-07 14:55:55 +02:00
569c66fb62
Merge pull request #1867 from crazy-max/bump-testify
...
vendor: github.com/stretchr/testify v1.8.4
2023-06-07 12:19:33 +02:00
93f7fbdd78
Merge pull request #1865 from crazy-max/bump-semver
...
vendor: github.com/Masterminds/semver/v3 v3.2.1
2023-06-07 12:19:17 +02:00
ea06685c11
Merge pull request #1858 from potherca-contrib/fix/typo-Shortand
...
Fix typo "Shortand" -> "Shorthand"
2023-06-06 14:03:40 -07:00
eaba4fa9e6
Update docs with result from `make docs` command.
...
Signed-off-by: Ben Peachey <potherca@gmail.com>
2023-06-06 21:43:41 +02:00
99e3882e2a
Merge pull request #1841 from crazy-max/desktop
...
build: display build details link
2023-06-06 19:06:19 +02:00
0a2f35970c
build: display build details link
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-06 18:54:31 +02:00
ab5f5e4169
build: fix quiet mode
...
We are using the quiet flag option and we are not taking
progress quiet mode into account
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-06 18:47:55 +02:00
696770d29c
Merge pull request #1840 from jedevc/fix-check-path-for-bake-cmd-context
2023-06-06 17:49:04 +02:00
b47b4e5957
vendor: github.com/stretchr/testify v1.8.4
...
full diff https://github.com/stretchr/testify/compare/v1.8.2...v1.8.4
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-06 17:44:58 +02:00
9a125afba0
vendor: github.com/compose-spec/compose-go v1.14.0
...
https: //github.com/compose-spec/compose-go/compare/v1.13.4...v1.14.0
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-06 17:34:34 +02:00
d34103b0d9
bake: fix potential context entitlements escape
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-06 17:17:03 +02:00
c820350b5e
tests: refactor cmd helpers to allow configuring cwd, etc
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-06 17:17:03 +02:00
61a7854659
tests: add bake test for remote subdir context
...
Fixed in 12b6a3ad9a
2023-06-06 17:15:19 +02:00
e859ebc12e
tests: add bake test for remote cmd context override
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-06 17:15:19 +02:00
ef997fd6d0
bake: fix BAKE_CMD_CONTEXT relative path resolution
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-06 17:15:19 +02:00
76c96347ff
tests: add basic remote bake context test
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-06 17:15:19 +02:00
48d7dafbd5
git: update gitutil test utilities
...
- Adds a new GitServeHTTP function to start an http server to serve a
target git repository.
- Adds a new GitDir helper method to get the path to the .git
directory
- Updates the GitAdd method to take a variable number of files
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-06 17:15:19 +02:00
d03e93f6f1
test: tmpdir can be a test helper
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-06 17:15:19 +02:00
fcb7810a38
Merge pull request #1854 from crazy-max/inspect-features
2023-06-06 16:59:58 +02:00
459d94bdf1
vendor: github.com/Masterminds/semver/v3 v3.2.1
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-06 16:55:59 +02:00
7cef021a8a
Merge pull request #1804 from jedevc/fixup-solve
2023-06-06 09:12:10 +02:00
c6db4cf342
build: clarify NewResultHandle comment
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-06 09:08:30 +02:00
6c9436fbd5
inspect: display builder features
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-05 23:11:58 +02:00
a906149930
Merge pull request #1862 from jedevc/update-contributing-tests
...
docs: update CONTRIBUTING.md with specific test notes
2023-06-01 21:55:12 +01:00
af328fe413
docs: update CONTRIBUTING.md with specific test notes
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-01 11:34:20 +01:00
183a73abae
build: docker exporter should instead use oci with containerd
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-05-31 15:59:55 +01:00
b7f0b3d763
build: clear exports for secondary solve request
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-05-31 15:13:56 +01:00
CrazyMax