dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 09:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,904 Commits 19 Branches 592 Tags
fbde2bcb9a8a8fcf06cc6fe1675560cf46237e7b
Commit Graph

53904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albin Kerouanton
fbde2bcb9a nftabler,nftablesdoc: stringify numerical dstnat prio 
When nftablesdoc tests dump the state of nftables, the argument '-y' /
'--numeric-priority' isn't used, so all priorities should be
stringified. However, there's a bug in older versions of nftables that
prevents the stringification of the 'dstnat' priority — it's currently
dumped as '-100'.

New versions fix that, and thus running these tests on Debian 13 fails
because of this discrepancy with golden files.

So, look for 'type nat hook output priority -100' and stringify the
priority to ensure compatibility across versions of nft.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2025-08-28 14:38:21 +02:00
Albin Kerouanton
a4949b669e iptablesdoc: remove -n from iptables -L invocations 
The output of `iptables -nvL` has changed in Debian 13 — the proto
column now shows protocol names instead of numbers, even when `-n` is
specified. This breaks the iptablesdoc golden files, which expect
protocols to be represented numerically.

This change comes from 34f085b1607364f4eaded1140060dcaf965a2649 in repo
git.netfilter.org/iptables (see [1]), which is a revert of
da8ecc62dd765b15df84c3aa6b83dcb7a81d4ffa (see [2]), and was made to
address a bug report (see [3]).

Unfortunately, this means there's a drift between iptables versions. So,
remove the `-n` flag altogether to ensure that the iptablesdoc tests
pass everywhere.

[1]: https://git.netfilter.org/iptables/commit/?id=da8ecc62dd765b15df84c3aa6b83dcb7a81d4ffa
[2]: https://git.netfilter.org/iptables/commit/?id=34f085b1607364f4eaded1140060dcaf965a2649
[3]: https://bugzilla.netfilter.org/show_bug.cgi?id=1729

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2025-08-28 14:38:20 +02:00
Albin Kerouanton
429110ebef Merge pull request #50819 from akerouanton/firewalld-ci 
hack/make/test-integration: disable firewalld integration
 2025-08-28 10:44:07 +02:00
Austin Vazquez
6f6d18865a Merge pull request #50775 from thaJeztah/bump_buildkit_v0.24 
vendor: github.com/moby/buildkit v0.24.0-rc1
 2025-08-27 16:49:35 -07:00
Sebastiaan van Stijn
229a29649f vendor: github.com/moby/buildkit v0.24.0-rc1 
full diff: https://github.com/moby/buildkit/compare/v0.23.2...v0.24.0-rc1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-08-28 00:12:05 +02:00
Albin Kerouanton
d0d3de04ff Merge pull request #50801 from akerouanton/move-golden-files 
d/libnet: move golden files into subdirs
 2025-08-27 22:01:57 +02:00
Rob Murray
32c3bedab6 Merge pull request #50827 from robmry/unmap_endpoint_addresses 
Unmap IPv4 addresses loaded from store
 2025-08-27 19:46:27 +01:00
Austin Vazquez
38be9f1257 Merge pull request #50824 from thaJeztah/fix_shadow 
ImageCache.restoreCachedImage: rename var that shadowed import
 2025-08-27 10:54:48 -07:00
Rob Murray
071e6472db Unmap IPv4 addresses loaded from store 
When a endpoint's net.IPNet is loaded from store and converted
to a netip.Addr, unmap it so that iptables rules don't contain
IPv4-mapped IPv6 addresses.

Signed-off-by: Rob Murray <rob.murray@docker.com>
 2025-08-27 18:16:15 +01:00
Austin Vazquez
8ac1bfa6c5 Merge pull request #50817 from austinvazquez/move-network-options-from-api-to-client 
api/types/network: move network create/connect/disconnect options from api to client
 2025-08-27 07:27:37 -07:00
Albin Kerouanton
60c6e57b82 hack/make/test-integration: disable firewalld integration 
The daemon started by the test-integration script needs to run without
firewalld integration to make sure that daemons started by networking
tests will handle firewalld reload without any interference (i.e.
without another daemon racing against them to recreate the iptables
chains).

Most tests are already running their own daemons, but the few that don't
and need firewalld integration are updated to start their own.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2025-08-27 16:12:04 +02:00
Austin Vazquez
1b4fcb8da7 api/types/network: move CreateOptions type to client module 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-27 08:10:20 -05:00
Sebastiaan van Stijn
b0b7260c77 ImageCache.restoreCachedImage: rename var that shadowed import 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-08-27 14:35:16 +02:00
Austin Vazquez
1e249cc309 api/types/network: move connect/disconnect options types to client module 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-27 07:05:52 -05:00
Paweł Gronowski
ed8a6a89ca Merge pull request #50809 from thaJeztah/container_inspect_merge 
api/types/container: merge InspectResponse and ContainerJSONBase
 2025-08-27 12:26:19 +02:00
Rob Murray
657f55a0a6 Merge pull request #50815 from akerouanton/drop-ipamOptions-from-CreateOptionIpam 
d/libnet: remove unused arg from CreateOptionIpam
 2025-08-27 10:06:58 +01:00
Akihiro Suda
0e7e1d37ac Merge pull request #50807 from thaJeztah/simplify_dev_env 
docs/contributing: minor fixes
 2025-08-27 17:46:06 +09:00
Sebastiaan van Stijn
6288414110 Merge pull request #50776 from austinvazquez/move-image-options-from-api-to-client 
api/types/image: move image options from api to client
 2025-08-27 00:45:28 +02:00
Albin Kerouanton
3003c5fe45 d/libnet: fix CreateOptionIPAM capitalization 
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2025-08-27 00:18:46 +02:00
Austin Vazquez
f6bfce8f06 Merge pull request #50816 from austinvazquez/move-swarm-secrets-list-options-to-client 
api/types/swarm: move `SecretListOptions` type to client
 2025-08-26 13:56:34 -07:00
Austin Vazquez
853aed171b api/types/image: move image option types to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 15:38:44 -05:00
Austin Vazquez
33066cddb1 api/types/swarm: move SecretListOptions type to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 14:15:35 -05:00
Sebastiaan van Stijn
33cdcd62f5 daemon: Daemon.getInspectData: also set Config 
Now that the types are merged, we can also set the config in this
function while the container state is locked.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-08-26 20:19:02 +02:00
Sebastiaan van Stijn
fae54e03af api/types/container: merge InspectResponse and ContainerJSONBase 
Merge the two types instead of embedding the ContainerJSONBase.
This should have no impact on the API response, but users constructing
a response through struct literals will need to update their code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-08-26 20:18:57 +02:00
Sebastiaan van Stijn
835afb123a Merge pull request #50813 from thaJeztah/fix_vendor 
fix vendor
 2025-08-26 20:18:36 +02:00
Albin Kerouanton
c9a0c93b04 d/libnet: remove unused arg from CreateOptionIpam 
CreateOptionIpam takes an `ipamOptions` argument, but all callers are
passing nil. So, remove it.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2025-08-26 20:15:24 +02:00
Sebastiaan van Stijn
b85c91f1b8 fix vendor 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-08-26 20:07:03 +02:00
Sebastiaan van Stijn
7145e7666b Merge pull request #50794 from austinvazquez/move-swarm-option-types-to-client 
api/types/swarm: move swarm option types to client
 2025-08-26 18:44:02 +02:00
Sebastiaan van Stijn
e317661b0c Merge pull request #50785 from austinvazquez/move-auth-config-functions-from-types 
api/types/registry: move auth config functions to pkg
 2025-08-26 18:39:24 +02:00
Sebastiaan van Stijn
2677aa6437 Merge pull request #50810 from thaJeztah/inspect_no_shadow 
daemon: Daemon.getInspectData: inline struct-literals
 2025-08-26 18:01:13 +02:00
Sebastiaan van Stijn
1dace990d9 Merge pull request #50798 from thaJeztah/readers_digest 
client: check for Digested reference instead of Canonical
 2025-08-26 17:02:43 +02:00
Sebastiaan van Stijn
44972d7427 daemon: Daemon.getInspectData: inline struct-literals 
Also rename the "container" argument, which shadowed an import.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-08-26 15:19:26 +02:00
Austin Vazquez
94d0b10503 api/types/swarm: move ServiceInspectOptions type to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:21:46 -05:00
Austin Vazquez
a2291e5eac api/types/swarm: move ServiceListOptions type to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:21:40 -05:00
Austin Vazquez
3b1e16594b api/types/swarm: move ServiceUpdateOptions type to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:21:33 -05:00
Austin Vazquez
bb4125e89f api/types/swarm: move ServiceCreateOptions type to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:21:33 -05:00
Austin Vazquez
4dcc7af116 api/types/swarm: move UpdateFlags type to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:21:23 -05:00
Austin Vazquez
ad0fa5a872 api/types/swarm: move TaskListOptions type to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:21:17 -05:00
Austin Vazquez
2718f953f0 api/types/swarm: move NodeRemoveOptions to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:21:17 -05:00
Austin Vazquez
7d2b87e95f api/types/swarm: move NodeListOptions to client mod 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:21:12 -05:00
Austin Vazquez
b1260cd493 api/types/swarm: move ConfigListOptions to client 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:21:05 -05:00
Austin Vazquez
bdce1608c8 api: move authconfig package from types/registry to pkg 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-08-26 07:17:45 -05:00
Sebastiaan van Stijn
ff0e644c88 daemon/cluster: use authconfig package for decoding 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-08-26 07:16:28 -05:00
Sebastiaan van Stijn
9f1d8be252 docs/contributing: minor fixes 
- Remove mention of `BIND_DIR` as it's no longer needed
- Update some links to files that were moved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-08-26 13:14:36 +02:00
Sebastiaan van Stijn
531be96bf9 Merge pull request #50800 from thaJeztah/rm_error_convert 
daemon/containerd: remove convertError utility
 2025-08-25 13:34:09 +02:00
Paweł Gronowski
f5df9eea84 Merge pull request #50796 from thaJeztah/sync_api_docs 
api: docs: update v1.52 swagger with latest changes
 2025-08-25 13:27:17 +02:00
Albin Kerouanton
1d6c7663c4 d/libnet/i/nftables: move golden files into subdir 
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2025-08-25 10:48:46 +02:00
Albin Kerouanton
28afa75c39 d/libnet: TestIptabler: move golden files into subdir 
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2025-08-25 10:48:41 +02:00
Albin Kerouanton
ce4a331287 d/libnet: TestNftabler: move golden files into subdir 
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2025-08-25 10:48:21 +02:00
Sebastiaan van Stijn
c5e75cc485 daemon/containerd: remove convertError utility 
The containerd errors and related containerd/errdefs should now
be interchangeable with moby/errdefs, so there's no longer a need
to convert these errors.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-08-23 21:45:10 +02:00