Commit Graph

54577 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
95fac07ccc client/secrets: Wrap results and options
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 23:18:39 +02:00
Austin Vazquez
2401bd1e12 Merge pull request #51250 from thaJeztah/less_log
integration/network: TestServiceWithDefaultAddressPoolInit fix log
2025-10-21 15:15:48 -05:00
Austin Vazquez
94501410a5 Merge pull request #51249 from thaJeztah/config_list_refactor
client: rename ConfigListResult.Configs to ConfigListResult.Items
2025-10-21 15:15:04 -05:00
Austin Vazquez
a6be6140a9 Merge pull request #51247 from thaJeztah/remove_withraw
client: remove VolumeInspectWithRaw, merge with VolumeInspect
2025-10-21 15:13:55 -05:00
Sebastiaan van Stijn
f5b0ce3988 integration/network: TestServiceWithDefaultAddressPoolInit fix log
This log was logging the whole inspect-response, including the "Raw" field;

    === RUN   TestServiceWithDefaultAddressPoolInit
        service_test.go:448: TestServiceWithDefaultAddressPoolInit: NetworkInspect: {Network:{Network:{Name:sthiraTestServiceWithDefaultAddressPoolInit ID:j4k7ql2dbyycbyew1i7fiyif3 Created:2025-10-21 19:00:32.418877317 +0000 UTC Scope:swarm Driver:overlay EnableIPv4:true EnableIPv6:false IPAM:{Driver:default Options:map[] Config:[{Subnet:20.20.1.0/24 IPRange:invalid Prefix Gateway:20.20.1.1 AuxAddress:map[]}]} Internal:false Attachable:false Ingress:false ConfigFrom:{Network:} ConfigOnly:false Options:map[com.docker.network.driver.overlay.vxlanid_list:4097] Labels:map[] Peers:[{Name:661bf7d013f3 IP:127.0.0.1}]} Containers:map[27af69f425142a8916c35f2d3a0ad4b7ea100db2d8309cfb8fb1fd65c1fd0bc1:{Name:TestServiceTestServiceWithDefaultAddressPoolInit.1.kss6lqx8nspg0o42evczitpda EndpointID:692933d4206760cd24b46a3df036dc2b3b8f87bc6f8fc711528a041f95fef084 MacAddress:02:42:14:14:01:03 IPv4Address:20.20.1.3/24 IPv6Address:invalid Prefix} lb-sthiraTestServiceWithDefaultAddressPoolInit:{Name:sthiraTestServiceWithDefaultAddressPoolInit-endpoint EndpointID:4685f15d277e748004bd963919fb34d9ea110415e7267ac68d5900f3dd8abb5d MacAddress:02:42:14:14:01:04 IPv4Address:20.20.1.4/24 IPv6Address:invalid Prefix}] Services:map[TestServiceTestServiceWithDefaultAddressPoolInit:{VIP:20.20.1.2 Ports:[] LocalLBIndex:256 Tasks:[{Name:TestServiceTestServiceWithDefaultAddressPoolInit.1.kss6lqx8nspg0o42evczitpda EndpointID:692933d4206760cd24b46a3df036dc2b3b8f87bc6f8fc711528a041f95fef084 EndpointIP:20.20.1.3 Info:map[Host IP:127.0.0.1]}]}] Status:0xc0001341d0} Raw:[123 34 78 97 109 101 34 58 34 115 116 104 105 114 97 84 101 115 116 83 101 114 118 105 99 101 87 105 116 104 68 101 102 97 117 108 116 65 100 100 114 101 115 115 80 111 111 108 73 110 105 116 34 44 34 73 100 34 58 34 106 52 107 55 113 108 50 100 98 121 121 99 98 121 101 119 49 105 55 102 105 121 105 102 51 34 44 34 67 114 101 97 116 101 100 34 58 34 50 48 50 53 45 49 48 45 50 49 84 49 57 58 48 48 58 51 50 46 52 49 56 56 55 55 51 49 55 90 34 44 34 83 99 111 112 101 34 58 34 115 119 97 114 109 34 44 34 68 114 105 118 101 114 34 58 34 111 118 101 114 108 97 121 34 44 34 69 110 97 98 108 101 73 80 118 52 34 58 116 114 117 101 44 34 69 110 97 98 108 101 73 80 118 54 34 58 102 97 108 115 101 44 34 73 80 65 77 34 58 123 34 68 114 105 118 101 114 34 58 34 100 101 102 97 117 108 116 34 44 34 79 112 116 105 111 110 115 34 58 110 117 108 108 44 34 67 111 110 102 105 103 34 58 91 123 34 83 117 98 110 101 116 34 58 34 50 48 46 50 48 46 49 46 48 47 50 52 34 44 34 73 80 82 97 110 103 101 34 58 34 34 44 34 71 97 116 101 119 97 121 34 58 34 50 48 46 50 48 46 49 46 49 34 125 93 125 44 34 73 110 116 101 114 110 97 108 34 58 102 97 108 115 101 44 34 65 116 116 97 99 104 97 98 108 101 34 58 102 97 108 115 101 44 34 73 110 103 114 101 115 115 34 58 102 97 108 115 101 44 34 67 111 110 102 105 103 70 114 111 109 34 58 123 34 78 101 116 119 111 114 107 34 58 34 34 125 44 34 67 111 110 102 105 103 79 110 108 121 34 58 102 97 108 115 101 44 34 79 112 116 105 111 110 115 34 58 123 34 99 111 109 46 100 111 99 107 101 114 46 110 101 116 119 111 114 107 46 100 114 105 118 101 114 46 111 118 101 114 108 97 121 46 118 120 108 97 110 105 100 95 108 105 115 116 34 58 34 52 48 57 55 34 125 44 34 76 97 98 101 108 115 34 58 123 125 44 34 80 101 101 114 115 34 58 91 123 34 78 97 109 101 34 58 34 54 54 49 98 102 55 100 48 49 51 102 51 34 44 34 73 80 34 58 34 49 50 55 46 48 46 48 46 49 34 125 93 44 34 67 111 110 116 97 105 110 101 114 115 34 58 123 34 50 55 97 102 54 57 102 52 50 53 49 52 50 97 56 57 49 54 99 51 53 102 50 100 51 97 48 97 100 52 98 55 101 97 49 48 48 100 98 50 100 56 51 48 57 99 102 98 56 102 98 49 102 100 54 53 99 49 102 100 48 98 99 49 34 58 123 34 78 97 109 101 34 58 34 84 101 115 116 83 101 114 118 105 99 101 84 101 115 116 83 101 114 118 105 99 101 87 105 116 104 68 101 102 97 117 108 116 65 100 100 114 101 115 115 80 111 111 108 73 110 105 116 46 49 46 107 115 115 54 108 113 120 56 110 115 112 103 48 111 52 50 101 118 99 122 105 116 112 100 97 34 44 34 69 110 100 112 111 105 110 116 73 68 34 58 34 54 57 50 57 51 51 100 52 50 48 54 55 54 48 99 100 50 52 98 52 54 97 51 100 102 48 51 54 100 99 50 98 51 98 56 102 56 55 98 99 54 102 56 102 99 55 49 49 53 50 56 97 48 52 49 102 57 53 102 101 102 48 56 52 34 44 34 77 97 99 65 100 100 114 101 115 115 34 58 34 48 50 58 52 50 58 49 52 58 49 52 58 48 49 58 48 51 34 44 34 73 80 118 52 65 100 100 114 101 115 115 34 58 34 50 48 46 50 48 46 49 46 51 47 50 52 34 44 34 73 80 118 54 65 100 100 114 101 115 115 34 58 34 34 125 44 34 108 98 45 115 116 104 105 114 97 84 101 115 116 83 101 114 118 105 99 101 87 105 116 104 68 101 102 97 117 108 116 65 100 100 114 101 115 115 80 111 111 108 73 110 105 116 34 58 123 34 78 97 109 101 34 58 34 115 116 104 105 114 97 84 101 115 116 83 101 114 118 105 99 101 87 105 116 104 68 101 102 97 117 108 116 65 100 100 114 101 115 115 80 111 111 108 73 110 105 116 45 101 110 100 112 111 105 110 116 34 44 34 69 110 100 112 111 105 110 116 73 68 34 58 34 52 54 56 53 102 49 53 100 50 55 55 101 55 52 56 48 48 52 98 100 57 54 51 57 49 57 102 98 51 52 100 57 101 97 49 49 48 52 49 53 101 55 50 54 55 97 99 54 56 100 53 57 48 48 102 51 100 100 56 97 98 98 53 100 34 44 34 77 97 99 65 100 100 114 101 115 115 34 58 34 48 50 58 52 50 58 49 52 58 49 52 58 48 49 58 48 52 34 44 34 73 80 118 52 65 100 100 114 101 115 115 34 58 34 50 48 46 50 48 46 49 46 52 47 50 52 34 44 34 73 80 118 54 65 100 100 114 101 115 115 34 58 34 34 125 125 44 34 83 101 114 118 105 99 101 115 34 58 123 34 84 101 115 116 83 101 114 118 105 99 101 84 101 115 116 83 101 114 118 105 99 101 87 105 116 104 68 101 102 97 117 108 116 65 100 100 114 101 115 115 80 111 111 108 73 110 105 116 34 58 123 34 86 73 80 34 58 34 50 48 46 50 48 46 49 46 50 34 44 34 80 111 114 116 115 34 58 91 93 44 34 76 111 99 97 108 76 66 73 110 100 101 120 34 58 50 53 54 44 34 84 97 115 107 115 34 58 91 123 34 78 97 109 101 34 58 34 84 101 115 116 83 101 114 118 105 99 101 84 101 115 116 83 101 114 118 105 99 101 87 105 116 104 68 101 102 97 117 108 116 65 100 100 114 101 115 115 80 111 111 108 73 110 105 116 46 49 46 107 115 115 54 108 113 120 56 110 115 112 103 48 111 52 50 101 118 99 122 105 116 112 100 97 34 44 34 69 110 100 112 111 105 110 116 73 68 34 58 34 54 57 50 57 51 51 100 52 50 48 54 55 54 48 99 100 50 52 98 52 54 97 51 100 102 48 51 54 100 99 50 98 51 98 56 102 56 55 98 99 54 102 56 102 99 55 49 49 53 50 56 97 48 52 49 102 57 53 102 101 102 48 56 52 34 44 34 69 110 100 112 111 105 110 116 73 80 34 58 34 50 48 46 50 48 46 49 46 51 34 44 34 73 110 102 111 34 58 123 34 72 111 115 116 32 73 80 34 58 34 49 50 55 46 48 46 48 46 49 34 125 125 93 125 125 44 34 83 116 97 116 117 115 34 58 123 34 73 80 65 77 34 58 123 34 83 117 98 110 101 116 115 34 58 123 34 50 48 46 50 48 46 49 46 48 47 50 52 34 58 123 34 73 80 115 73 110 85 115 101 34 58 53 44 34 68 121 110 97 109 105 99 73 80 115 65 118 97 105 108 97 98 108 101 34 58 50 53 49 125 125 125 125 125 10]}

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 21:29:59 +02:00
Sebastiaan van Stijn
2c5e0a008a client: rename ConfigListResult.Configs to ConfigListResult.Items
Also consolidate the options with the method.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 20:43:38 +02:00
Sebastiaan van Stijn
30490759b9 Merge pull request #51221 from thaJeztah/libnet_controller
libnetwork: move Network.resolveDriver to Controller
2025-10-21 19:41:14 +02:00
Sebastiaan van Stijn
c18c432852 Merge pull request #51246 from thaJeztah/volume_list
client: rename VolumeListResult.List to VolumeListResult.Items
2025-10-21 19:19:23 +02:00
Sebastiaan van Stijn
67cbf36ac9 client: remove VolumeInspectWithRaw, merge with VolumeInspect
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 19:00:57 +02:00
Sebastiaan van Stijn
26d57f42a8 Merge pull request #51245 from thaJeztah/network_opts
client: NetworkInspect, NetworkList: wrap output structs, and remove NetworkInspectWithRaw
2025-10-21 18:50:33 +02:00
Austin Vazquez
e30e80de0a Merge pull request #51244 from austinvazquez/refactor-client-swarm
client: refactor swarm api functions to wrap params/responses
2025-10-21 11:35:56 -05:00
Sebastiaan van Stijn
5a04a9718d client: rename VolumeListResult.List to VolumeListResult.Items
Trying to find a common naming for these fields.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 18:07:50 +02:00
Sebastiaan van Stijn
485b95600a client: NetworkList: wrap result
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 17:40:19 +02:00
Sebastiaan van Stijn
3fbf5a3bd1 client: NetworkInspect: wrap result and remove NetworkInspectWithRaw
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 17:26:24 +02:00
Austin Vazquez
612342198c client: refactor swarm api functions to wrap params/responses
Co-authored-by: Claude <noreply@anthropic.com>
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-10-21 10:17:04 -05:00
Sebastiaan van Stijn
ac9838ffd1 Merge pull request #51236 from vvoland/client-image-opts-functionalwrap
client/image_(inspect,history,load,save): Wrap return values
2025-10-21 16:54:02 +02:00
Sebastiaan van Stijn
b60738d19f Merge pull request #51234 from austinvazquez/refactor-client-task
client: refactor task responses
2025-10-21 16:52:00 +02:00
Sebastiaan van Stijn
343185cf1a libnetwork: move Network.resolveDriver to Controller
In this method, the network was controlling the controller, and its
driver-registry. That really felt like two steps too far; let's just
move this method to the controller, so that it can stay, at least
_somewhat_ in control of its own, non-exported, properties.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 16:50:33 +02:00
Sebastiaan van Stijn
8c1a909601 Merge pull request #51148 from ndeloof/decode-JSONMessage-push
introduce ImagePushResponse
2025-10-21 16:15:49 +02:00
Sebastiaan van Stijn
8a211dea40 Merge pull request #51240 from thaJeztah/hotel_notel
hack: disable go telemetry in integration tests
2025-10-21 15:30:10 +02:00
Rob Murray
7989fea6d2 Merge pull request #51241 from thaJeztah/overlay_pass_context
libnetwork/drivers/overlay: pass context for logger
2025-10-21 14:22:12 +01:00
Sebastiaan van Stijn
ee3cab4158 libnetwork/drivers/overlay: pass context for logger
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 15:08:03 +02:00
Sebastiaan van Stijn
bdc7474826 Merge pull request #51229 from olljanat/win-overlay-custom-dns
libnetwork: support custom DNS servers in Windows overlay driver
2025-10-21 14:40:07 +02:00
Austin Vazquez
38ef4fd576 client: refactor task responses
Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 14:36:30 +02:00
Paweł Gronowski
2d69edd28a client/image_(inspect,history,load,save): Wrap return values
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 14:23:38 +02:00
Rob Murray
7066eb3736 Merge pull request #51223 from thaJeztah/cleaner_marshal
libnetwork: EndpointInterface: cleanup marshal/unmarshal
2025-10-21 12:10:36 +01:00
Sebastiaan van Stijn
acc9563f48 Merge pull request #51228 from thaJeztah/move_some_integration_cli_tests
integration-cli: move some tests to integration
2025-10-21 12:48:12 +02:00
Sebastiaan van Stijn
35acf347eb hack: disable go telemetry in integration tests
commit 081987b647 updated the Dockerfile
to disable go's telemetry in our dev / test-environment; as collecting
this data doesn't serve much purpose.

However, the configuration to disable telemetry is tied to the user's
home-directory (HOME); and disabling telemetry writs a config-file to the
user's home-directory (`~/.config/go/telemetry/mode`). While go provides
env-vars about the mode and location (`GOTELEMETRY` and `GOTELEMETRYDIR`),
those env-vars are read-only and cannot be used to either disable telemetry
or to set the location;

> Information about telemetry configuration is also available via read-only Go environment variables:
>
>  go env GOTELEMETRY reports the telemetry mode.
> go env GOTELEMETRYDIR reports the directory holding telemetry configuration and data.

Some steps in our CI set up a different home-directory, which is not configured
to disable telemetry, which means that CI currently leaves behind a bunch of
files related to this;

    make TEST_FILTER=TestPruneDontDeleteUsedDangling test-integration
    tree -a bundles/test-integration/fake-HOME/
    bundles/test-integration/fake-HOME/
    └── .config
        └── go
            └── telemetry
                ├── local
                │   ├── asm@go1.25.3-go1.25.3-linux-arm64-2025-10-21.v1.count
                │   ├── compile@go1.25.3-go1.25.3-linux-arm64-2025-10-21.v1.count
                │   ├── go@go1.25.3-go1.25.3-linux-arm64-2025-10-21.v1.count
                │   ├── link@go1.25.3-go1.25.3-linux-arm64-2025-10-21.v1.count
                │   ├── test2json@go1.25.3-go1.25.3-linux-arm64-2025-10-21.v1.count
                │   ├── upload.token
                │   └── weekends
                └── upload

    6 directories, 7 files

This patch disables go telemetry also for this home-directory to prevent
those files from being created, and to prevent go from producing the
telemetry.

With this patch, only the file to disable telemetry is produced:

    make TEST_FILTER=TestPruneDontDeleteUsedDangling test-integration
    tree -a bundles/test-integration/fake-HOME/
    bundles/test-integration/fake-HOME/
    └── .config
        └── go
            └── telemetry
                └── mode

    4 directories, 1 file

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 12:17:30 +02:00
Sebastiaan van Stijn
79f01e4ffc Merge pull request #51217 from thaJeztah/hotel_california
libnetwork/drivers/macvlan, ipvlan: remove some redundant code, and cleanups / fixes
2025-10-21 12:03:01 +02:00
Sebastiaan van Stijn
9fe856a5f3 integration-cli: move some tests to integration
Migrates:

- TestAPIErrorJSON
- TestContainerAPIInvalidPortSyntax
- TestContainerAPIRestartPolicyInvalidPolicyName
- TestContainerAPIRestartPolicyRetryMismatch
- TestContainerAPIRestartPolicyNegativeRetryCount
- TestContainerAPIRestartPolicyDefaultRetryCount
- TestCreateWithTooLowMemoryLimit

Co-authored-by: Sameer Gupta <sameergupta4873@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 12:01:55 +02:00
Sebastiaan van Stijn
1ff6a963ad Merge pull request #51216 from sameergupta4873/50159-migrate-test-api-error-not-found-json
test: migrate test api error not found json
2025-10-21 11:57:56 +02:00
Sebastiaan van Stijn
ebfcc6cf61 Merge pull request #51194 from thaJeztah/handle_macaddr
api/types/container: remove deprecated Config.MacAddress
2025-10-21 11:16:05 +02:00
Sameer Gupta
62a71a8261 test: migrate test api error not found json
Signed-off-by: Sameer Gupta <sameergupta4873@gmail.com>
2025-10-21 14:18:04 +05:30
Sebastiaan van Stijn
33fc45e5c5 libnetwork: EndpointInterface: cleanup marshal/unmarshal
Define an intermediate struct for marshaling/unmarshaling; this
struct already uses netip types (in case we want to migrate the
actual struct to use these types as well).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 10:37:05 +02:00
Sebastiaan van Stijn
461b8fe502 Merge pull request #51237 from vvoland/label-depsnomods
gha/labeler: Exclude client and api modules from dependencies label
2025-10-21 09:33:20 +02:00
Olli Janatuinen
48c2d8c458 libnetwork: support custom DNS servers in Windows overlay driver
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2025-10-21 07:33:02 +00:00
Sebastiaan van Stijn
a8950e0192 api/types/container: remove deprecated Config.MacAddress
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 09:15:26 +02:00
Sebastiaan van Stijn
79912d4c7f daemon: Daemon.getInspectData: move migration code to router
There also appeared to be duplication between daemon.getInspectData,
and the containerRouter.postContainersCreate methods, as both were
back-filling the field.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 09:15:18 +02:00
Sebastiaan van Stijn
91ce33d4b0 daemon/server/router/container: remove uses of deprecated MacAddress
Rewrite the router to use a local struct to unmarshal the deprecated
field for requests that send it, and adjust the adoption code.

There also appeared to be duplication between daemon.getInspectData,
and the containerRouter.postContainersCreate methods, as both were
back-filling the field.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 08:33:42 +02:00
Sebastiaan van Stijn
0030ba21e3 client: ContainerCreate: remove handling of legacy MacAddress
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 08:33:42 +02:00
Sebastiaan van Stijn
e5864a51ac integration/networking: TestWatchtowerCreate: rewrite with request util
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 08:33:42 +02:00
Sebastiaan van Stijn
8088de791c integration/networking: TestInspectCfgdMAC: rewrite with request util
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 08:33:42 +02:00
Sebastiaan van Stijn
b4b0b6f10f integration/container: rewrite with request for MacAddress
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-10-21 08:33:42 +02:00
Austin Vazquez
0ad58d39a4 Merge pull request #51078 from vvoland/client-config-opts
client/config: Wrap results and options
2025-10-20 18:41:31 -05:00
Paweł Gronowski
762fc029f0 Merge pull request #51232 from dmcgowan/fix-container-os-migration
Move container platform migration logic
2025-10-20 23:52:48 +02:00
Paweł Gronowski
4b22807a0f gha/labeler: Exclude client and api modules from dependencies label
Prevent applying `area/dependencies` when the `client` and `api` modules
are changed.

Due to the replace rule present for these modules, we have to revendor
them with each change which would trigger the previous rule.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-10-20 23:47:35 +02:00
Paweł Gronowski
abf5679049 client/inspect: Better Raw handling
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-10-20 22:29:36 +02:00
Paweł Gronowski
ee22a50b75 client/config: Use Config instead of Spec as field
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-10-20 22:29:36 +02:00
Paweł Gronowski
f4b06e66e1 client/config: Wrap results and options
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-10-20 22:29:36 +02:00
Sebastiaan van Stijn
72e9c3af99 Merge pull request #51211 from austinvazquez/move-client-volume-create-options
api/types/volume: move `CreateOptions` to `client.VolumeCreateOptions`
2025-10-20 21:44:03 +02:00