b3a4f95110
Merge pull request #1897 from crazy-max/test-containerd-snap
...
test: register docker worker with containerd snapshotter
2023-06-21 00:11:31 +02:00
28a1eb3527
test: fix testImageIDOutput
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-20 17:04:21 +02:00
75ecc15958
test: fix inspect and ls
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-20 17:04:21 +02:00
2235ebce2f
test: register docker worker with containerd snapshotter
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-20 17:04:21 +02:00
7147463418
dockerfile: update docker to 24.0.2
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-20 16:50:38 +02:00
010e4c8d54
Merge pull request #1890 from jedevc/tests-share-docker-container-backend
2023-06-20 14:24:09 +01:00
6f394a0691
tests: set a dedicated buildx config dir for each worker
...
This should help reduce any unexpected config conflict between workers.
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-20 12:40:45 +01:00
efd7279118
ci: run docker-container tests in parallel
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-20 12:28:51 +01:00
601056f3a7
tests: share single docker between docker-container backends
...
This means that we can run our docker-container tests in parallel again,
which can help speed up our test runs by a *significant* amount.
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-20 12:28:49 +01:00
0a7f96cbfb
vendor: update buildkit to master@2d91ddcceedc
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-20 12:27:46 +01:00
1c530c2fe0
Merge pull request #1896 from dvdksn/docs/add-experimental-debugmonitor
...
docs: add experimental annotation for debug-shell command
2023-06-20 12:46:26 +02:00
1e576dd7c6
chore: make docs
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2023-06-20 12:05:30 +02:00
7a5472153b
docs: set experimental annotation
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-20 11:42:02 +02:00
daba16f4be
Merge pull request #1879 from crazy-max/fix-ctx-validation
...
builder: skip name validation for docker context
2023-06-15 14:05:37 +02:00
ee36e2264e
Merge pull request #1880 from jedevc/fix-dockerfile-cwd-join
...
bake: fix incorrect dockerfile resolution against `cwd://` context
2023-06-15 14:05:13 +02:00
329e98d9f0
Merge pull request #1883 from docker/dependabot/github_actions/peter-evans/create-pull-request-5.0.2
...
build(deps): Bump peter-evans/create-pull-request from 5.0.1 to 5.0.2
2023-06-15 13:55:26 +02:00
f4513f7028
build(deps): Bump peter-evans/create-pull-request from 5.0.1 to 5.0.2
...
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request ) from 5.0.1 to 5.0.2.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases )
- [Commits](284f54f989...153407881e
2023-06-14 18:59:43 +00:00
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
431732f5d1
bake: fix incorrect dockerfile resolution against cwd:// context
...
We need to resolve the strip the cwd:// prefix before attempting to
resolve the dockerfile. Otherwise, we'll get the cwd:// prefix in the
dockerfile name, which isn't stripped out later.
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-14 12:18:53 +01: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
CrazyMax