1751 Commits

Author SHA1 Message Date
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 8ad30d0a35ac34b9ee89e8fa7dbbebd85a4d69dd)
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 05ef20b434544e680fd072e46cfcefb5340ba854)
2023-07-19 11:55:09 +02:00
Sebastiaan van Stijn
35dac12ae5
commands: NewRootCmd: remove obsolete logrus filter hook
This hook was added in 278f94a8b62052ed790bb1c6832268eb79a6d03d and
72758fef22441c37f809cce098f73a21e618b9d1 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 094d1aded87d583d5d0ceac7b82955f1b445b8d1)
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 cc718b34443428ea15933948abf074b20aacf599)
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 130bbda00ece3ffc864c86a643e66270f41e073a)
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 ff2c8da803011c13232e64a3ab153e12539187d8)
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 e094296f376164f3aeddda4cf744d4909560b2fb)
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 6f394a06919a5271f7423e9778889841a6550832)
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 efd7279118642afcb285646d5d4db3e2527ac1d1)
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 601056f3a719a0fa4d437d07a7214bda9ba25e95)
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 0a7f96cbfb1de8f7877244f828fa92b79067373a)
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 4384947be15c7e3827fff79cc83dc22e7a3a3db8)
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 418ea82d3a972cf01c0c5b2968242f62daec4b8f)
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 b9e25e82cfbbe7c413ddc4ebe6f88d81c02a9db3)
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 1123bfed103887ace2b2020796083323e22cbb3f)
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 7f2293308b5e6b0144fc635f971044f29593dd76)
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 c4bec0546686a8978c692de97f31cf9e460e1af0)
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 8a3a646c6130937eba92caca09a6beb4d2a1bcda)
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 bc597e6b5ecf06a31c6a637d04d66b7e1120c564.

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 8cbb7a93198ef308b9d1a87254977fc57afaaeba)
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 87b9f9ecfbc5bbd32fb3a3e39f08bd9be20870ae)
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 cbc473359a113f3615036049054fb096fcadd4ef)
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 20d2501edcaa5874abb5231fcaaaaca4f884b79e)
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 d45601fdc6a6fac755143260e562dcabae6954ac)
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 7147463418b9c3aad9bbbcd2c6c0f0308d4045ab)
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 e65f6b8c8b7a465621e231d6d8fa97fd02f2988b)
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 120f3a89184c1ee31c6df60860fde114415b1e31)
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 1e576dd7c635a1aecd045596108d5afc9ff93ea5)
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 7a5472153ba488905553ccb91ffd7aa29226d7dc)
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 b1c5449428436271eaa71b143e9682372ec238a4)
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 431732f5d1f029f14adbf5828ae9798c0b9b3936)
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