Commit Graph

49656 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
cdbfae1d3e api/server/router/grpc: NewRouter: set correct MaxRecvMsgSize, MaxSendMsgSize
[buildkit@29b4b1a537][1] applied changes to `buildkitd` to set the correct
defaults, which should be 16MB, but used the library defaults. Without that
change, builds using large Dockerfiles would fail with a `ResourceExhausted`
error;

    => [internal] load build definition from Dockerfile
     => => transferring dockerfile: 896.44kB
    ERROR: failed to receive status: rpc error: code = ResourceExhausted desc = grpc: received message larger than max (44865299 vs. 16777216)

However those changes were applied to the `buildkitd` code, which is the
daemon when running BuildKit standalone (or in a container through the
`container` driver). When running a build with the BuildKit builder compiled
into the Docker Engine, that code is not used, so the BuildKit changes did
not fix the issue.

This patch applies the same changes as were made in [buildkit@29b4b1a537][1]
to the gRPC endpoint provided by the dockerd daemon.

[1]: 29b4b1a537

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-26 11:15:46 +02:00
Paweł Gronowski
951a04cc01 Merge pull request #48239 from crazy-max/update-buildkit
vendor: update buildkit to v0.15.1
2024-07-25 18:42:52 +02:00
CrazyMax
1baf8f9e60 vendor: update buildkit to v0.15.1
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
2024-07-25 17:18:15 +02:00
Sebastiaan van Stijn
2b1097f080 Merge pull request #48170 from thaJeztah/migrate_userns
migrate to github.com/moby/sys/userns
2024-07-25 14:06:54 +02:00
Sebastiaan van Stijn
2ce811e632 migrate to github.com/moby/sys/user/userns
The userns package in libcontainer was integrated into the moby/sys/user
module at commit [3778ae603c706494fd1e2c2faf83b406e38d687d][1].

The userns package is used in many places, and currently either depends
on runc/libcontainer, or on containerd, both of which have a complex
dependency tree. This patch is part of a series of patches to unify the
implementations, and to migrate toward that implementation to simplify
the dependency tree.

[1]: 3778ae603c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-25 12:47:34 +02:00
Sebastiaan van Stijn
91dfc326cf vendor: github.com/moby/sys/user v0.2.0
full diff: https://github.com/moby/sys/compare/user/v0.1.0...user/v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-25 11:43:42 +02:00
Akihiro Suda
d25a728327 Merge pull request #48234 from thaJeztah/vendor_flock
vendor: github.com/gofrs/flock v0.12.1
2024-07-25 17:49:29 +09:00
Sebastiaan van Stijn
1e2ccf8046 vendor: github.com/gofrs/flock v0.12.1
- fix: missing read-write flag in reopenFDOnError
  fixes a regression that could result in a `ERROR: bad file descriptor`.

b659e1e00a
introduced a regression where `f.flag` would not be in read-write mode
[1]  but read-only [2] which breaks people using NFS protocol.

[1]: b659e1e00a (diff-87c2c4fe0fb43f4b38b4bee45c1b54cfb694c61e311f93b369caa44f6c1323ffR192)
[2]: b659e1e00a (diff-22145325dded38eb5288ed3321a113d8260ccc70747ee04d4551bfd2fba975fdR69)

full diff: https://github.com/gofrs/flock/compare/v0.12.0...v0.12.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-25 00:42:23 +02:00
Sebastiaan van Stijn
077b32ac4e vendor: golang.org/x/sys v0.22.0
full diff: https://github.com/golang/sys/compare/v0.21.0...v0.22.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-25 00:37:04 +02:00
Sebastiaan van Stijn
be7470ce58 Merge pull request #48216 from AkihiroSuda/docker-install-417
dockerd-rootless-setuptool.sh: move RootlessKit smoke test
2024-07-24 15:10:44 +02:00
Rob Murray
48877c682d Merge pull request #48217 from robmry/network_test_cleanup
Clean up networks in 'integration/network' tests
2024-07-24 09:09:34 +01:00
Tianon Gravi
70eca41910 Merge pull request #48212 from thaJeztah/burning_them_with_fire
contrib/check-config.sh: remove special case for userns on CentOS/RHEL 7
2024-07-23 15:17:36 -07:00
Tianon Gravi
67c5cf07ea Merge pull request #47789 from williamh/47770-control-enable-journald-driver
hack: explicitly control enabling the journald logging driver
2024-07-23 15:00:27 -07:00
Sebastiaan van Stijn
bed37b6152 Merge commit from fork
[master] AuthZ plugin security fixes
2024-07-23 21:36:28 +02:00
Rob Murray
4c97ff777d Clean up networks in 'integration/network' tests
Makes TestDaemonDefaultNetworkPools re-runnable, and stops the
accumulation of bridges from the others.

Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-07-23 10:38:57 +01:00
Akihiro Suda
e2237240f5 dockerd-rootless-setuptool.sh: move RootlessKit smoke test
`dockerd-rootless-setuptool.sh check` now skips the smoke test for
running RootlessKit.

Fix docker/docker-install issue 417

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2024-07-23 14:35:02 +09:00
Akihiro Suda
c98f01ecf2 Merge pull request #48198 from thaJeztah/bump_moby_sys
vendor: github.com/moby/sys/sequential v0.6.0
2024-07-23 13:56:45 +09:00
Sebastiaan van Stijn
a3efa3026b contrib/check-config.sh: remove special case for userns on CentOS/RHEL 7
This check was added in 2355151556 to handle
non-standard behavior in CentOS/RHEL 7;

> Add check for RHEL7/CentOS7 experimental userns disabled
>
> Add a check in `check-config.sh` to see if we are running on a RHEL7 or
> CentOS7 system, which may report that CONFIG_USERNS is OK/enabled, but
> user namespaces still won't work because of the experimental feature
> flag added by Redhat.
>
> This will add a warning if it is actually disabled and notes what has to
> be added to the grub/boot command line to enable it.

Now that CentOS/RHEL 7 reached EOL, we can remove this special case.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-22 23:48:33 +02:00
Sebastiaan van Stijn
21fd5a3f30 vendor: github.com/moby/sys/sequential v0.6.0
full diff: https://github.com/moby/sys/compare/sequential/v0.5.0...sequential/v0.6.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 21:28:27 +02:00
Akihiro Suda
733755d7cb Merge pull request #48189 from thaJeztah/bump_moby_sys
vendor: update moby/sys modules
2024-07-20 00:33:12 +09:00
Sebastiaan van Stijn
adbc4bc9ef Merge pull request #48188 from thaJeztah/vendor_containerd_1.7.20
vendor: github.com/containerd/containerd v1.7.20
2024-07-19 12:51:01 +02:00
Sebastiaan van Stijn
490721871b Merge pull request #48190 from thaJeztah/update_containerd_binary_1.7.20
update containerd binary to v1.7.20
2024-07-19 12:34:48 +02:00
Sebastiaan van Stijn
155dd66753 Merge pull request #48194 from thaJeztah/fix_pr_title_check
gha: check-pr-branch: fix branch check regression
2024-07-19 12:33:59 +02:00
Sebastiaan van Stijn
e0b98a3222 gha: check-pr-branch: fix branch check regression
This check was updated in f460110ef5, but
introduced some bugs;

- the regular expressions were meant to define a capturing group, but
  the braces (`(`, `)`) were escaped (they previously were used by
  `sed`, which requires different escaping), so no value was captured.
- the check itself was not updated to use the resulting `$target_branch`
  env-var, so was comparing against the `$GITHUB_BASE_REF` (which is
  the branch name before stripping minor versions).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 12:26:17 +02:00
Paweł Gronowski
30749b6a7b Merge pull request #48186 from thaJeztah/bump_buildx_compose
Dockerfile: update buildx to v0.16.1, compose to v2.29.0
2024-07-19 10:05:00 +02:00
Sebastiaan van Stijn
fbbda057ac update containerd binary to v1.7.20
Update the containerd binary that's used in CI and for the static packages.

release notes: https://github.com/containerd/containerd/releases/tag/v1.7.20
full diff: https://github.com/containerd/containerd/compare/v1.7.18...v1.7.19

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 02:32:27 +02:00
Sebastiaan van Stijn
cb7c976456 Merge pull request #48177 from thaJeztah/relax_pr_check
gha: check-pr-branch: verify major version only
2024-07-19 02:25:50 +02:00
Sebastiaan van Stijn
f460110ef5 gha: check-pr-branch: verify major version only
We'll be using release branches for minor version updates, so instead
of (e.g.) a 27.0 branch, we'll be using 27.x and continue using the
branch for minor version updates.

This patch changes the validation step to only compare against the
major version.

Co-authored-by: Cory Snider <corhere@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 01:20:40 +02:00
Sebastiaan van Stijn
6a6b49f2de vendor: github.com/moby/sys/symlink v0.3.0
full diff: https://github.com/moby/sys/compare/symlink/v0.2.0...symlink/v0.3.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 00:58:43 +02:00
Sebastiaan van Stijn
68636d56fc vendor: github.com/moby/sys/signal v0.7.1
full diff: https://github.com/moby/sys/compare/signal/v0.7.0...signal/v0.7.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 00:57:30 +02:00
Sebastiaan van Stijn
44b266ab59 vendor: github.com/moby/sys/mount v0.3.4
full diff: https://github.com/moby/sys/compare/mount/v0.3.3...mount/v0.3.4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 00:56:52 +02:00
Sebastiaan van Stijn
dc4a12874e vendor: github.com/moby/sys/mountinfo v0.7.2
full diff: https://github.com/moby/sys/compare/mountinfo/v0.7.1...mountinfo/v0.7.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 00:53:31 +02:00
Sebastiaan van Stijn
55a5f3fcaa vendor: github.com/containerd/containerd v1.7.20
full diff: https://github.com/containerd/containerd/compare/v1.7.19...v1.7.20

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 00:41:20 +02:00
Sebastiaan van Stijn
a42f7fd717 Dockerfile: update compose to v2.29.0
This is the version used in the dev-container, and for testing.

release notes: https://github.com/docker/compose/releases/tag/v2.29.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 00:08:01 +02:00
Sebastiaan van Stijn
97b51c6b72 Dockerfile: update buildx to v0.16.1
This is the version used in the dev-container, and for testing.

release notes:
https://github.com/docker/buildx/releases/tag/v0.16.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-19 00:05:18 +02:00
Sebastiaan van Stijn
f39409f80d Merge pull request #48078 from vvoland/c8d-buildkit-tag-event
c8d/build: Log `image tag` event when image was built with Buildkit
2024-07-18 21:46:49 +02:00
Sebastiaan van Stijn
c9d76ec00d Merge pull request #48176 from corhere/readme-commercial-support
README: replace obsolete Docker EE mention
2024-07-18 18:41:13 +02:00
Cory Snider
b37c983d31 README: replace obsolete Docker EE mention
Docker EE is no more. Point users looking for commercial support at the
currently-maintained commercial products based on the Moby project:
Docker Desktop and Mirantis Container Runtime.

Signed-off-by: Cory Snider <csnider@mirantis.com>
2024-07-17 18:01:50 -04:00
Paweł Gronowski
3a62d4917b Merge pull request #48169 from kolyshkin/layer-regexp
rm regexp use
2024-07-17 11:52:23 +02:00
Kir Kolyshkin
508939821b daemon/containerd: rm use of regexp
Replace the regexp check with a function.

Keep the use of regexp.QuoteMeta.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2024-07-16 13:06:01 -07:00
Kir Kolyshkin
b66d4b567a image/v1: rm regexp use
Replace the regexp checking ID validity with a for loop.

The benefits are:
 - faster (up to 10x faster with less allocations);
 - no init overhead to compile the regexp.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2024-07-16 12:46:57 -07:00
Kir Kolyshkin
1c0dc8a94f layer: rm regexp use
Replace the regexp checking ID validity with a function. The benefits
are:

 - function is faster (up to 10x faster with less allocations);
 - no init overhead to compile the regexp;

Add a test case.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2024-07-16 12:30:17 -07:00
William Hubbs
499c842c52 hack: explicitly control enabling the journald logging driver
Without this, the dependency on systemd is said to be "automagic", which
can lead to breakage, for example, if a binary package of docker is
built on a system that has systemd installed then installed on a system
that does not have systemd installed.

for example: https://bugs.gentoo.org/914076

Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
2024-07-16 11:00:29 -05:00
Sebastiaan van Stijn
aae044039c Merge pull request #48165 from thaJeztah/bump_google_deps
vendor: cloud.google.com/go/logging v1.9.0
2024-07-15 23:52:14 +02:00
Sebastiaan van Stijn
fb5acc4377 Merge pull request #48143 from thaJeztah/graphdriver_remove_capabilities
daemon/graphdriver: remove Capabilities, CapabilityDriver
2024-07-15 21:25:24 +02:00
Jameson Hyde
5282cb25d0 If url includes scheme, urlPath will drop hostname, which would not match the auth check
Signed-off-by: Jameson Hyde <jameson.hyde@docker.com>
(cherry picked from commit 754fb8d9d03895ae3ab60d2ad778152b0d835206)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-07-15 18:43:48 +02:00
Jameson Hyde
2ac8a479c5 Authz plugin security fixes for 0-length content and path validation
Signed-off-by: Jameson Hyde <jameson.hyde@docker.com>

fix comments

(cherry picked from commit 9659c3a52bac57e615b5fb49b0652baca448643e)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-07-15 18:43:43 +02:00
Sebastiaan van Stijn
20a0102c5f Merge pull request #48139 from corhere/go119atomics
all: switch to Go 1.19 atomics
2024-07-15 18:03:41 +02:00
Sebastiaan van Stijn
0fa71a4cfc vendor: cloud.google.com/go/logging v1.9.0
removes dependency on appengine, among others

full diff: https://github.com/googleapis/google-cloud-go/compare/logging/v1.0.1...logging/v1.9.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-15 13:30:37 +02:00
Sebastiaan van Stijn
eafad2cb86 vendor: golang.org/x/oauth2 v0.21.0
removes dependency on appengine, among others

full diff: https://github.com/golang/oauth2/compare/v0.11.0...v0.21.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-07-15 13:12:58 +02:00