CrazyMax
4e547752af
Merge pull request #1977 from dvdksn/docs/cherrypick_fup_buildinfo
...
[0.11 backport] docs: update since buildinfo removal
2023-07-31 11:16:47 +02:00
CrazyMax
95eee3e747
docs: update since buildinfo removal
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 8ad30d0a35
)
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
2023-07-31 10:59:33 +02:00
CrazyMax
d5bfd8334f
Merge pull request #1960 from thaJeztah/0.11_backport_update_cli
...
[0.11 backport] vendor: github.com/docker/cli v24.0.4
2023-07-19 12:42:41 +02:00
CrazyMax
2083f24938
Merge pull request #1962 from crazy-max/v0.11_backport_fix-internal-build
...
[0.11 backport] build: set remote bake def and remote dockerfile as internal solve
2023-07-19 12:42:01 +02:00
CrazyMax
84da4ec603
build: set remote bake def and remote dockerfile as internal solve
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 05ef20b434
)
2023-07-19 11:55:09 +02:00
Sebastiaan van Stijn
35dac12ae5
commands: NewRootCmd: remove obsolete logrus filter hook
...
This hook was added in 278f94a8b6
and
72758fef22
to suppress spurious warnings
printed by the CLI's cli/connhelper/commandconn package;
3fb4fb83df/cli/connhelper/commandconn/commandconn.go (L203-L214)
Those logs were removed in a5ebe2282a
so we can remove the hook.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 094d1aded8
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-19 11:05:40 +02:00
Sebastiaan van Stijn
27f332f135
vendor: github.com/docker/cli v24.0.4
...
full diff: https://github.com/docker/cli/compare/v24.0.2...v24.0.4
notable changes:
- ssh: fix error on commandconn close, add ping and default
- commandconn: return original error while closing
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit cc718b3444
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-18 17:17:31 +02:00
Justin Chadwell
9872040b66
Merge pull request #1958 from thaJeztah/0.11_backport_buildkit_0.12
v0.11.2
2023-07-18 15:52:35 +01:00
Sebastiaan van Stijn
d8c6c3fc30
vendor: github.com/moby/buildkit v0.12.1-0.20230717122532-faa0cc7da353
...
full diff:
- https://github.com/moby/buildkit/compare/20230620112432...v0.12.0
- https://github.com/moby/buildkit/compare/v0.12.0...faa0cc7da3536923d85b74b2bb2d13c12a6ecc99
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 130bbda00e
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-18 16:42:24 +02:00
Sebastiaan van Stijn
69f929077b
vendor: github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb
...
full diff: 9e7a6df485...36ef4d8c0d
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit ff2c8da803
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-18 16:42:24 +02:00
Sebastiaan van Stijn
87ce701fe0
vendor: github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb
...
full diff: 4e3ac2762d...02993c407b
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit e094296f37
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-18 16:42:24 +02:00
Justin Chadwell
6faf7e5688
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 >
(cherry picked from commit 6f394a0691
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-18 16:41:54 +02:00
Justin Chadwell
d21e9fa8c6
ci: run docker-container tests in parallel
...
Signed-off-by: Justin Chadwell <me@jedevc.com >
(cherry picked from commit efd7279118
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-18 16:41:45 +02:00
Justin Chadwell
5657006c1f
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 >
(cherry picked from commit 601056f3a7
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-18 16:41:34 +02:00
Justin Chadwell
0424ae14c0
vendor: update buildkit to master@2d91ddcceedc
...
Signed-off-by: Justin Chadwell <me@jedevc.com >
(cherry picked from commit 0a7f96cbfb
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-18 16:35:53 +02:00
Justin Chadwell
66fd2bbdee
Merge pull request #1957 from crazy-max/v0.11_backport_fix-kube-config
2023-07-18 15:16:29 +01:00
CrazyMax
3305f18ce5
k8s: fix missing kubeconfig check from endpoint
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 4384947be1
)
2023-07-18 15:57:11 +02:00
CrazyMax
a8790788d1
Merge pull request #1955 from crazy-max/v0.11_backport_result-handle-internal
...
[0.11 backport] build: mark result handle build as internal
2023-07-17 20:51:47 +02:00
CrazyMax
0f6513a29a
build: mark result handle build as internal
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 418ea82d3a
)
2023-07-17 17:13:10 +02:00
Justin Chadwell
44f5946a66
Merge pull request #1951 from thaJeztah/0.11_backport_remove_imageutil_dead_code
2023-07-17 14:26:58 +01:00
CrazyMax
ea610d8f14
Merge pull request #1953 from thaJeztah/0.11_backport_update-go
...
[0.11 backport] update go to 1.20.6
2023-07-17 14:05:11 +02:00
Sebastiaan van Stijn
d78c75947d
util/imagetools: remove unused Resolver.ImageConfig
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit b9e25e82cf
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-17 13:39:43 +02:00
CrazyMax
7dddd3a7d3
hack(generated-files): bump golang image to bookworm
...
#7 [internal] load metadata for docker.io/library/golang:1.20.6-buster
#7 ERROR: docker.io/library/golang:1.20.6-buster: not found
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 1123bfed10
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-17 13:39:13 +02:00
CrazyMax
54de900931
update go to 1.20.6
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
(cherry picked from commit 7f2293308b
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-17 13:39:12 +02:00
Justin Chadwell
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 c4bec05466
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-17 13:39:12 +02:00
Justin Chadwell
a24b6dd4f5
Merge pull request #1952 from thaJeztah/0.11_backport_bump_docker
2023-07-17 12:38:16 +01:00
CrazyMax
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 8a3a646c61
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-07-17 12:48:31 +02:00
Justin Chadwell
b4df08551f
Merge pull request #1930 from jedevc/revert-bc597e6b
v0.11.1
2023-07-05 17:37:36 +01:00
Justin Chadwell
f581942d7d
Merge pull request #1929 from jedevc/vendor-vt100-update
2023-07-05 17:37:20 +01:00
Justin Chadwell
5159571dfc
Revert "bake: fix incorrect dockerfile resolution against cwd:// context"
...
This reverts commit bc597e6b5e
.
Signed-off-by: Justin Chadwell <me@jedevc.com >
2023-07-05 17:25:09 +01:00
Justin Chadwell
86a5c77c2b
vendor: update tonistiigi/vt100 to master@f9a4f7ef6531
...
Signed-off-by: Justin Chadwell <me@jedevc.com >
2023-07-05 16:47:43 +01:00
Justin Chadwell
1602b491f9
Merge pull request #1926 from jedevc/v0.11-cherry-picks
2023-07-05 13:54:12 +01:00
CrazyMax
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
CrazyMax
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
CrazyMax
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
CrazyMax
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
CrazyMax
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
CrazyMax
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
Jhan S. Álvarez
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
CrazyMax
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
David Karlsson
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
CrazyMax
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
Justin Chadwell
ff87dd183a
Merge pull request #1885 from crazy-max/v0.11.1_backport
2023-06-21 11:23:10 +01:00
CrazyMax
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
Justin Chadwell
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
CrazyMax
687feca9e8
Merge pull request #1877 from jedevc/cache-dockerutil-features
...
dockerutil: cache feature collection
v0.11.0
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