CrazyMax
87b9f9ecfb
docs: update generated content
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-27 17:21:05 +02:00
CrazyMax
cbc473359a
vendor: update cli-docs-tool to 0.6.0
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-27 17:21:04 +02:00
Justin Chadwell
2eba60db75
Merge pull request #1916 from jedevc/add-local-bake-test
2023-06-27 11:28:47 +01:00
Justin Chadwell
0dcbed3f53
tests: add simple local bake test
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-27 11:16:44 +01:00
CrazyMax
707dc43d55
Merge pull request #1903 from crazy-max/fix-bake-compose-profiles
...
bake: ignore profiles in compose definitions
2023-06-26 15:02:53 +02:00
CrazyMax
4f5a56aadb
Merge pull request #1904 from thaJeztah/cleanup_ParseEntitlements
...
utils/buildflags: ParseEntitlements(): use BuildKit's parsing
2023-06-23 14:26:44 +02:00
Sebastiaan van Stijn
399beb53d9
utils/buildflags: ParseEntitlements(): use BuildKit's parsing
...
Use buildkit's parsing of entitlements to make sure that accepted
values match what's accepted by BuildKit.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-06-23 10:44:30 +02:00
CrazyMax
120f3a8918
bake: ignore profiles in compose definitions
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-22 17:44:35 +02:00
CrazyMax
bd672eaf5b
Merge pull request #1886 from crazy-max/docker-local
...
build: prefer local image resolution for docker driver
2023-06-21 11:20:24 +02:00
CrazyMax
c2500ea2d8
build: prefer local image resolution for docker driver
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-21 11:05:06 +02:00
Justin Chadwell
a4663b4b2e
Merge pull request #1900 from cyphar/build-go_extra_flags
2023-06-21 09:59:19 +01:00
Aleksa Sarai
57c618b83a
build: add GO_EXTRA_FLAGS argument
...
This is useful for setting things like -buildmode=pie when packaging
docker-buildx for distributions.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
2023-06-21 18:48:05 +10:00
CrazyMax
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
CrazyMax
28a1eb3527
test: fix testImageIDOutput
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-20 17:04:21 +02:00
CrazyMax
75ecc15958
test: fix inspect and ls
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-20 17:04:21 +02:00
CrazyMax
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
CrazyMax
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
Justin Chadwell
010e4c8d54
Merge pull request #1890 from jedevc/tests-share-docker-container-backend
2023-06-20 14:24:09 +01:00
Justin Chadwell
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
Justin Chadwell
efd7279118
ci: run docker-container tests in parallel
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-20 12:28:51 +01:00
Justin Chadwell
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
Justin Chadwell
0a7f96cbfb
vendor: update buildkit to master@2d91ddcceedc
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-20 12:27:46 +01:00
CrazyMax
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
David Karlsson
1e576dd7c6
chore: make docs
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2023-06-20 12:05:30 +02:00
CrazyMax
7a5472153b
docs: set experimental annotation
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-20 11:42:02 +02:00
CrazyMax
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
CrazyMax
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
CrazyMax
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
dependabot[bot]
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
CrazyMax
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
Justin Chadwell
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
CrazyMax
687feca9e8
Merge pull request #1877 from jedevc/cache-dockerutil-features
...
dockerutil: cache feature collection
2023-06-13 11:42:22 +02:00
Justin Chadwell
d4a2c8d0c3
dockerutil: cache feature collection
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-13 09:47:38 +01:00
Justin Chadwell
bef42b2441
Merge pull request #1876 from tonistiigi/remove-history-request
2023-06-13 09:38:05 +01:00
CrazyMax
2de333fdd3
check history api support once
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2023-06-13 10:29:22 +02:00
Tonis Tiigi
1138789f20
avoid extra client for history API detection
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2023-06-12 17:39:09 -07:00
Justin Chadwell
1f4ac09ffb
Merge pull request #1874 from thaJeztah/bump_engine_24.0.2
2023-06-09 11:39:13 +01:00
CrazyMax
26a8ffb393
Merge pull request #1873 from jedevc/vendor-buildkit-master
...
vendor: update buildkit to master@67a08623b95a
2023-06-09 12:14:11 +02:00
CrazyMax
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Justin Chadwell
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
Justin Chadwell
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
Justin Chadwell
9d2388e6f5
vendor: update buildkit to master@67a08623b95a
...
Signed-off-by: Justin Chadwell <me@jedevc.com>
2023-06-09 10:36:52 +01:00
Timofey Kirillov
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
Justin Chadwell
2c02db8db4
Merge pull request #1835 from ktock/long-form-json
2023-06-08 17:10:37 +01:00
Kohei Tokunaga
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
Kohei Tokunaga
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
Justin Chadwell
c30bcade2c
Merge pull request #1870 from tianon/invoke-entrypoint-fixes
2023-06-08 16:03:24 +01:00
Tianon Gravi
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
