50e414f82a
hack: force go version to 1.20.5
...
A temporary workaround for "http: invalid Host header" introduced in
go 1.20.6.
Signed-off-by: Justin Chadwell <me@jedevc.com >
(cherry picked from commit c4bec05466github@gone.nl >
2023-07-17 13:39:12 +02:00
a24b6dd4f5
Merge pull request #1952 from thaJeztah/0.11_backport_bump_docker
2023-07-17 12:38:16 +01:00
66600be6ab
vendor: github.com/docker/docker@24.0 36e9e79
...
client: define a "dummy" hostname to use for local connections
fixes "http: invalid Host header" errors when compiling with go1.20.6
or go1.19.11
full diff: https://github.com/docker/docker/compare/v24.0.2...36e9e796c6fc
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 8a3a646c61github@gone.nl >
2023-07-17 12:48:31 +02:00
b4df08551f
Merge pull request #1930 from jedevc/revert-bc597e6b
2023-07-05 17:37:36 +01:00
f581942d7d
Merge pull request #1929 from jedevc/vendor-vt100-update
2023-07-05 17:37:20 +01:00
5159571dfc
Revert "bake: fix incorrect dockerfile resolution against cwd:// context"
...
This reverts commit bc597e6b5eme@jedevc.com >
2023-07-05 17:25:09 +01:00
86a5c77c2b
vendor: update tonistiigi/vt100 to master@f9a4f7ef6531
...
Signed-off-by: Justin Chadwell <me@jedevc.com >
2023-07-05 16:47:43 +01:00
1602b491f9
Merge pull request #1926 from jedevc/v0.11-cherry-picks
2023-07-05 13:54:12 +01:00
94baaf3c90
build: fix host-gateway handling
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 8cbb7a9319
2023-07-03 21:58:40 +02:00
c5e279f295
docs: update generated content
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 87b9f9ecfb
2023-07-03 21:58:40 +02:00
a0f91eb87e
vendor: update cli-docs-tool to 0.6.0
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit cbc473359a
2023-07-03 21:58:40 +02:00
cb1812ec6a
test: build details output
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 20d2501edc
2023-07-03 21:58:39 +02:00
47e4c2576b
build: missing newline when printing build details on error
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit d45601fdc6
2023-07-03 21:58:39 +02:00
3702e17ed5
dockerfile: update docker to 24.0.2
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 7147463418
2023-07-03 21:58:39 +02:00
8b85dbea72
controller: include CgroupParent in build.Options
...
Signed-off-by: Jhan S. Álvarez <alvarezpcuser@gmail.com >
(cherry picked from commit e65f6b8c8b
2023-07-03 11:55:40 +01:00
afcb118e10
bake: ignore profiles in compose definitions
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 120f3a8918
2023-07-03 11:55:40 +01:00
cb4fea66e0
chore: make docs
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
(cherry picked from commit 1e576dd7c6
2023-07-03 11:53:42 +01:00
74fa66b496
docs: set experimental annotation
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 7a5472153b
2023-07-03 11:53:42 +01:00
ff87dd183a
Merge pull request #1885 from crazy-max/v0.11.1_backport
2023-06-21 11:23:10 +01:00
9f844df9f7
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 >
(cherry picked from commit b1c5449428
2023-06-15 14:10:24 +02:00
bc597e6b5e
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 >
(cherry picked from commit 431732f5d1
2023-06-15 14:10:23 +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
