vendor: github.com/moby/moby/api, client 0769fe708773 (master) #6545

thaJeztah · 2025-10-08T22:36:13Z

supersedes, closes [DNM] temp vendor branch #6538
supersedes, closes vendor: github.com/moby/moby/api, github.com/moby/moby/client master #6534
depends on / stacked on cli/command/container: remove localhostDNSWarning #6535
depends on / stacked on cli/command/container: inline some variables #6536
depends on / stacked on rename some vars to prevent shadowing imports #6537
depends on client: ImagePullResponse: don't panic without reader moby/moby#51159
depends on api: fix swarm network field from addr to prefix moby/moby#51150

vendor: github.com/moby/moby/api, github.com/moby/moby/client master

full diff: moby/moby@4ca8aed...0769fe7

- What I did

- How I did it

- How to verify it

- Human readable description for the release notes

- A picture of a cute animal (not mandatory but encouraged)

thaJeztah · 2025-10-08T23:57:45Z

vendor/github.com/moby/moby/api/types/swarm/network.go

+	NetworkID string     `json:",omitempty"`
+	Addr      netip.Prefix `json:",omitempty"`


api: change IP address fields over to netip types moby/moby#50956 (comment)

docker stack deploy --compose-file=./testdata/full-stack.yml --detach=false test-stack-remove ParseAddr("10.0.1.2/24"): unexpected character (at "/24")

docker stack ls ParseAddr("10.0.1.2/24"): unexpected character (at "/24")

It looks like the service returns this;

curl -s --unix-socket /var/run/docker.sock http://localhost/v1.51/services/bmu1cozv5cca | jq .Endpoint { "Spec": { "Mode": "vip" }, "VirtualIPs": [ { "NetworkID": "yy6jjster3oudzp0ck77ai0id", "Addr": "10.0.1.2/24" } ] }

So older versions of docker ... returned an address range in CIDR notation?

docker network create --scope=swarm --driver=overlay hello 0k61ecfc29ifqj5lnam9usveu docker service create --network hello --name foo alpine top mx0vntfyklgnikrzj59gnmxur overall progress: 1 out of 1 tasks 1/1: running verify: Service mx0vntfyklgnikrzj59gnmxur converged docker service inspect --format '{{json .Endpoint}}' foo {"Spec":{"Mode":"vip"},"VirtualIPs":[{"NetworkID":"0k61ecfc29ifqj5lnam9usveu","Addr":"10.0.1.2/24"}]}

And looks indeed that .. it does?
https://github.com/moby/moby/blob/b8a4f6534f736bc5223c9ee13d210a55a22481d7/daemon/cluster/executor/container/container.go#L573-L583

Value is set from the Swarm API?
https://github.com/moby/moby/blob/6bbb92df70fb433ce89353e41c2158db67feceb0/daemon/cluster/convert/network.go#L121-L142

thaJeztah · 2025-10-09T08:08:17Z

Not there yet; task listing also fails;

docker stack ps test-stack-remove -f=desired-state=running --format json
ParseAddr("10.0.1.3/24"): unexpected character (at "/24")

curl -s --unix-socket /var/run/docker.sock 'http://localhost/v1.51/tasks' | jq .

[
  {
    "ID": "l4rynxbamvixckla83rcdk557",
    "Version": {
      "Index": 52
    },
    "CreatedAt": "2025-10-09T07:53:35.684913628Z",
    "UpdatedAt": "2025-10-09T07:53:37.761470712Z",
    "Labels": {},
    "Spec": {
      "ContainerSpec": {
        "Image": "alpine:latest@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412",
        "Labels": {
          "com.docker.stack.namespace": "test-stack-remove"
        },
        "Args": [
          "top"
        ],
        "Privileges": {
          "CredentialSpec": null,
          "SELinuxContext": null,
          "NoNewPrivileges": false
        },
        "Isolation": "default"
      },
      "Resources": {},
      "Placement": {
        "Platforms": [
          {
            "Architecture": "amd64",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "arm64",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "386",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "ppc64le",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "riscv64",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "s390x",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          }
        ]
      },
      "Networks": [
        {
          "Target": "c1i5g04zw3zkznjvjbbv4iizc",
          "Aliases": [
            "one"
          ]
        }
      ],
      "ForceUpdate": 0
    },
    "ServiceID": "kp75t36rdju3q9sys3ir38rd4",
    "Slot": 1,
    "NodeID": "n1rgi7t220c5lgsvwu2so3krr",
    "Status": {
      "Timestamp": "2025-10-09T07:53:37.718913879Z",
      "State": "running",
      "Message": "started",
      "ContainerStatus": {
        "ContainerID": "a1693df4c760b41d38e3c13027fcdd5a88040b0f267dfcad2ace4a66e29f04d2",
        "PID": 69448,
        "ExitCode": 0
      },
      "PortStatus": {}
    },
    "DesiredState": "running",
    "NetworksAttachments": [
      {
        "Network": {
          "ID": "c1i5g04zw3zkznjvjbbv4iizc",
          "Version": {
            "Index": 38
          },
          "CreatedAt": "2025-10-09T07:53:33.956330835Z",
          "UpdatedAt": "2025-10-09T07:53:33.957696627Z",
          "Spec": {
            "Name": "test-stack-remove_default",
            "Labels": {
              "com.docker.stack.namespace": "test-stack-remove"
            },
            "DriverConfiguration": {
              "Name": "overlay"
            },
            "Scope": "swarm"
          },
          "DriverState": {
            "Name": "overlay",
            "Options": {
              "com.docker.network.driver.overlay.vxlanid_list": "4098"
            }
          },
          "IPAMOptions": {
            "Driver": {
              "Name": "default"
            },
            "Configs": [
              {
                "Subnet": "10.0.1.0/24",
                "Gateway": "10.0.1.1"
              }
            ]
          }
        },
        "Addresses": [
          "10.0.1.3/24"
        ]
      }
    ],
    "Volumes": null
  },
  {
    "ID": "to1zvgc2flky65q092g9umvr6",
    "Version": {
      "Index": 53
    },
    "CreatedAt": "2025-10-09T07:53:37.485566337Z",
    "UpdatedAt": "2025-10-09T07:53:37.964857212Z",
    "Labels": {},
    "Spec": {
      "ContainerSpec": {
        "Image": "alpine:latest@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412",
        "Labels": {
          "com.docker.stack.namespace": "test-stack-remove"
        },
        "Args": [
          "top"
        ],
        "Privileges": {
          "CredentialSpec": null,
          "SELinuxContext": null,
          "NoNewPrivileges": false
        },
        "Isolation": "default"
      },
      "Resources": {},
      "Placement": {
        "Platforms": [
          {
            "Architecture": "amd64",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "arm64",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "386",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "ppc64le",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "riscv64",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          },
          {
            "Architecture": "s390x",
            "OS": "linux"
          },
          {
            "Architecture": "unknown",
            "OS": "unknown"
          }
        ]
      },
      "Networks": [
        {
          "Target": "c1i5g04zw3zkznjvjbbv4iizc",
          "Aliases": [
            "two"
          ]
        }
      ],
      "ForceUpdate": 0
    },
    "ServiceID": "o5gzytctv0si0j2mm81cdh58b",
    "Slot": 1,
    "NodeID": "n1rgi7t220c5lgsvwu2so3krr",
    "Status": {
      "Timestamp": "2025-10-09T07:53:37.889173462Z",
      "State": "running",
      "Message": "started",
      "ContainerStatus": {
        "ContainerID": "1f80279860feedcd36162b757a285de87a687893a679da7d5316d07872bc434c",
        "PID": 69504,
        "ExitCode": 0
      },
      "PortStatus": {}
    },
    "DesiredState": "running",
    "NetworksAttachments": [
      {
        "Network": {
          "ID": "c1i5g04zw3zkznjvjbbv4iizc",
          "Version": {
            "Index": 38
          },
          "CreatedAt": "2025-10-09T07:53:33.956330835Z",
          "UpdatedAt": "2025-10-09T07:53:33.957696627Z",
          "Spec": {
            "Name": "test-stack-remove_default",
            "Labels": {
              "com.docker.stack.namespace": "test-stack-remove"
            },
            "DriverConfiguration": {
              "Name": "overlay"
            },
            "Scope": "swarm"
          },
          "DriverState": {
            "Name": "overlay",
            "Options": {
              "com.docker.network.driver.overlay.vxlanid_list": "4098"
            }
          },
          "IPAMOptions": {
            "Driver": {
              "Name": "default"
            },
            "Configs": [
              {
                "Subnet": "10.0.1.0/24",
                "Gateway": "10.0.1.1"
              }
            ]
          }
        },
        "Addresses": [
          "10.0.1.6/24"
        ]
      }
    ],
    "Volumes": null
  }
]

codecov-commenter · 2025-10-09T08:15:50Z

Codecov Report

❌ Patch coverage is 59.52381% with 119 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
cli/command/container/stats.go	0.00%	20 Missing ⚠️
cli/command/utils.go	0.00%	14 Missing ⚠️
cli/command/container/opts.go	77.19%	9 Missing and 4 partials ⚠️
cli/command/swarm/init.go	14.28%	12 Missing ⚠️
cli/command/network/connect.go	70.96%	6 Missing and 3 partials ⚠️
opts/network.go	30.76%	6 Missing and 3 partials ⚠️
cli/command/service/opts.go	41.66%	7 Missing ⚠️
cli/command/network/create.go	77.77%	4 Missing and 2 partials ⚠️
opts/opts.go	0.00%	4 Missing ⚠️
opts/swarmopts/port.go	71.42%	3 Missing and 1 partial ⚠️
... and 12 more

📢 Thoughts on this report? Let us know!

thaJeztah · 2025-10-09T08:17:45Z

Getting close now; remaining failures;

Error: something went wrong
--- FAIL: TestParseWithExpose (0.00s)
    opts_test.go:461: Expected 1 exposed port, got 0
Error: 
Error:

Looks like --ip-range accepts / accepted some fuzzy formats;

CIDR ("255.255.0.0.30/24")
<start IP>-<end IP> ("192.168.83.1-192.168.83.254")

--- FAIL: TestNetworkCreateErrors (0.00s)
    --- FAIL: TestNetworkCreateErrors/#03 (0.00s)
        create_test.go:150: assertion failed: error is not nil: invalid argument "255.255.0.0.30/24" for "--ip-range" flag: invalid string being converted to CIDR: 255.255.0.0.30/24
    --- FAIL: TestNetworkCreateErrors/#08 (0.00s)
        create_test.go:154: assertion failed: expected error to contain "cannot configure multiple ranges (192.168.1.200/24, 192.168.1.0/24) on the same subnet (192.168.1.250/24)", got "cannot configure multiple ranges (192.168.1.0/24, 192.168.1.0/24) on the same subnet (192.168.1.250/24)"
    --- FAIL: TestNetworkCreateErrors/#12 (0.00s)
        create_test.go:154: assertion failed: expected an error, got nil
    --- FAIL: TestNetworkCreateErrors/#13 (0.00s)
        create_test.go:150: assertion failed: error is not nil: invalid argument "192.168.83.1-192.168.83.254" for "--ip-range" flag: invalid string being converted to CIDR: 192.168.83.1-192.168.83.254
FAIL

thaJeztah · 2025-10-09T08:41:42Z

Looks like --ip-range accepts / accepted some fuzzy formats;

CIDR ("255.255.0.0.30/24")

<start IP>-<end IP> ("192.168.83.1-192.168.83.254")

Oh! I was wrong there; it did NOT accept that, but previously the cobra command would fail, and now the flag itself invalidates it; it expects an error for that test;

cli/cli/command/network/create_test.go

Lines 130 to 135 in b1ea4fe

    
           flags: map[string]string{ 
        
           	"ip-range": "192.168.83.1-192.168.83.254", 
        
           	"gateway":  "192.168.80.1", 
        
           	"subnet":   "192.168.80.0/20", 
        
           }, 
        
           expectedError: "invalid CIDR address: 192.168.83.1-192.168.83.254",

But expected the flag parsing to not fail (as it was a []string, so no special handling);

cli/cli/command/network/create_test.go

Lines 146 to 148 in b1ea4fe

    
           for key, value := range tc.flags { 
        
           	assert.NilError(t, cmd.Flags().Set(key, value)) 
        
           }

thaJeztah · 2025-10-09T13:29:07Z

I continued looking at this failure;

#18 63.28 === FAIL: cli/command/network TestNetworkCreateErrors/ip-range=192.168.1.0/24,192.168.1.200/24,gateway=192.168.1.1,192.168.1.4,subnet=192.168.2.0/24,192.168.1.250/24,toto (0.00s)
#18 63.28     create_test.go:153: assertion failed: expected error to contain "cannot configure multiple ranges (192.168.1.200/24, 192.168.1.0/24) on the same subnet (192.168.1.250/24)", got "cannot configure multiple ranges (192.168.1.0/24, 192.168.1.0/24) on the same subnet (192.168.1.250/24)"
#18 63.28 
#18 63.28 === FAIL: cli/command/network TestNetworkCreateErrors/gateway=255.255.0.0,subnet=255.255.0.0/24,aux-address=255.255.0.30/24,toto (0.00s)
#18 63.28     create_test.go:153: assertion failed: expected an error, got nil

And.... LOL... it's just because the test is .. bad? The flag returns the same value twice because they parse to the same 😂 https://go.dev/play/p/r7a0txKjths

package main

import (
	"fmt"
	"net"
	"strings"
)

func main() {
	for _, ipNetStr := range []string{"192.168.1.0/24", "192.168.1.200/24"} {
		_, n, err := net.ParseCIDR(strings.TrimSpace(ipNetStr))
		if err != nil {
			panic(err)
		}
		fmt.Println("parsed:", ipNetStr, "->", n.String())
	}
}

Above outputs;

parsed: 192.168.1.0/24 -> 192.168.1.0/24
parsed: 192.168.1.200/24 -> 192.168.1.0/24

cli/command/image/pull_test.go

thaJeztah · 2025-10-09T21:26:52Z

docs/reference/commandline/config_ls.md

 | Name                                   | Type     | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                          |
 |:---------------------------------------|:---------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [`-f`](#filter), [`--filter`](#filter) | `filter` |         | Filter output based on conditions provided                                                                                                                                                                                                                                                                                                                                                                                           |
+| [`-f`](#filter), [`--filter`](#filter) | `filter` | `{}`    | Filter output based on conditions provided                                                                                                                                                                                                                                                                                                                                                                                           |


Wondering if we can hide the default for these (as {} isn't very informative for the user)

I guess one option would be to not initialize that variable:

cli/cli/command/config/ls.go

Line 25 in 6ddff81

listOpts := listOptions{filter: opts.NewFilterOpt()}

and then initialize it just before doing Add in:

cli/opts/opts.go

Line 311 in 6ddff81

o.filter.Add(name, val)

?

Oh, I could play with that idea. Definitely not the most urgent I guess; also because we need to look at some of those custom options and if they're still needed / critical or if we could use more standard options / flags.

thaJeztah · 2025-10-09T21:27:20Z

docs/reference/commandline/container_create.md

+| `--ip`                    | `ip`          | `<nil>`   | IPv4 address (e.g., 172.30.100.104)                                                                                                                                                                                                                                                                              |
+| `--ip6`                   | `ip`          | `<nil>`   | IPv6 address (e.g., 2001:db8::33)                                                                                                                                                                                                                                                                                |


Same for these

A few optional options just have an empty field where the default is empty (--hostname, --expose etc)... maybe that'd be best here too?

Yeah, I want to look what's needed to hide this; need to look how the docs-tool gets the information from the flags (possibly the flag itself returns <nil> as a string for empty values.

thaJeztah · 2025-10-10T11:14:04Z

cli/command/image/prune.go

-	pruneFilters := options.filter.Value().Clone()
+	pruneFilters := maps.Clone(options.filter.Value())


This needs a different approach; maps.Clone does not create a deep-copy, so mutating the filter still mutates the original.

I have a draft (will push) to add a .Clone() method to the client.Filters type, but I can start with an internal package in the CLI to do a deep clone in case we're the only one needing that.

☝️ added some local utilities for this, and opened a draft PR in moby;

client: Filters: add Clone method moby/moby#51163

cli/command/plugin/completion.go

cli/command/container/opts_test.go

cli/command/network/connect.go

cli/command/network/create.go

robmry · 2025-10-10T13:35:44Z

cli/command/network/create.go


 	// Populate non-overlapping subnets into consolidation map
 	for _, s := range options.subnets {
+		// TODO(thaJeztah): is all this validation needed on the CLI-side?


I think it is ... because options like --subnet 192.0.2.0/24 --subnet 198.51.100.0/24 --subnet 2001:db8:1234::/64 --gateway 198.51.100.0 --ip-range 192.0.2.128/25 need to be collated into three network.IPAMConfig objects (one per subnet) - and the only way to work out which options belong in which IPAMConfig is to understand the subnets and addresses.

And, for example ... if there are overlapping subnets the other options may be ambiguous, if there's more than one gateway in a subnet there's no way to represent that in IPAMConfig, etc.

Ah, yes, you mentioned that, and I guess I didn't really register that. So, yes, looks like we still need this, but perhaps we should have a utility for that in the client; at least once we have functional options, this seems like something ideal to be handled there, so that others don't have to re-invent the exact same logic WDYT?

I guess we could already do that before the functional options 🤔

It DOES make me wonder though if the ipamOptions struct would've been the better type for the client.NetworkCreateOptions

cli/cli/command/network/create.go

Lines 35 to 42 in 6ddff81

type ipamOptions struct {

driver string

subnets []string

ipRanges []string

gateways []string

auxAddresses opts.MapOpts

driverOpts opts.MapOpts

}

Because ultimately it means that we expand the ipamOptions into a network.IPAM struct, so that single options struct into a slice of []network.IPAMConfig, but all data needed for that is already captured in ipamOptions?

cli/vendor/github.com/moby/moby/api/types/network/ipam.go

Lines 10 to 23 in 6ddff81

// IPAM represents IP Address Management

type IPAM struct {

Driver string

Options map[string]string // Per network IPAM driver options

Config []IPAMConfig

}

// IPAMConfig represents IPAM configurations

type IPAMConfig struct {

Subnet string `json:",omitempty"`

IPRange string `json:",omitempty"`

Gateway string `json:",omitempty"`

AuxAddress map[string]string `json:"AuxiliaryAddresses,omitempty"`

}

Or would there be cases where manually crafting the []network.IPAMConfig is something that would be done? 🤔

So the IPAM field in client.NetworkCreateOptions could have a type like ipamOptions instead of network.IPAM ... and we'd do all this validation/collation in Client.NetworkCreate, in order to construct the API request?

Yes, that could be good.

Trying to think of reasons to construct it manually, not coming up with much ... in IPv6, the gateway doesn't need to be part of the subnet. For us, that'd be most likely to be useful for macvlan/ipvlan-l2 networks (not regular bridge networks anyway). So, to support that using ipamOptions in a network with more than one IPv6 subnet, I think we'd need a way to work out which one the gateway belonged to.

As you say, functional options will make it easier.

cli/command/network/connect.go

cli/command/swarm/init.go

robmry · 2025-10-10T14:02:53Z

docs/reference/commandline/container_create.md

+| `--ip`                    | `ip`          | `<nil>`   | IPv4 address (e.g., 172.30.100.104)                                                                                                                                                                                                                                                                              |
+| `--ip6`                   | `ip`          | `<nil>`   | IPv6 address (e.g., 2001:db8::33)                                                                                                                                                                                                                                                                                |


A few optional options just have an empty field where the default is empty (--hostname, --expose etc)... maybe that'd be best here too?

opts/swarmopts/port.go

robmry

LGTM (with the planned squash!).

thaJeztah · 2025-10-10T17:32:56Z

Thank YOU!!! Gonna do a big squash now 👍

full diff: moby/moby@4ca8aed...0769fe7 Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah commented Oct 8, 2025

View reviewed changes

thaJeztah force-pushed the bump_engine_take2 branch 11 times, most recently from 8782f4b to 8f2b791 Compare October 9, 2025 01:52

thaJeztah force-pushed the bump_engine_take2 branch from 8f2b791 to 10004b9 Compare October 9, 2025 08:12

thaJeztah force-pushed the bump_engine_take2 branch from 10004b9 to 8cb5b2c Compare October 9, 2025 08:20

thaJeztah force-pushed the bump_engine_take2 branch 4 times, most recently from bfdd48d to 6974f4f Compare October 9, 2025 10:31

thaJeztah mentioned this pull request Oct 9, 2025

assorted test-improvements #6546

Merged

thaJeztah force-pushed the bump_engine_take2 branch 3 times, most recently from d7f690c to 10c859d Compare October 9, 2025 12:57

thaJeztah force-pushed the bump_engine_take2 branch 3 times, most recently from 57ce7eb to 00489b7 Compare October 9, 2025 15:29

thaJeztah force-pushed the bump_engine_take2 branch 5 times, most recently from 559bc11 to 9818ee0 Compare October 9, 2025 21:16

thaJeztah commented Oct 9, 2025

View reviewed changes

cli/command/image/pull_test.go Show resolved Hide resolved

thaJeztah commented Oct 9, 2025

View reviewed changes

thaJeztah mentioned this pull request Oct 10, 2025

client: ImagePullResponse: don't panic without reader moby/moby#51159

Merged

thaJeztah force-pushed the bump_engine_take2 branch from c9c98f2 to 4a819bb Compare October 10, 2025 10:01

thaJeztah commented Oct 10, 2025

View reviewed changes

thaJeztah force-pushed the bump_engine_take2 branch from 4a819bb to e707d9c Compare October 10, 2025 11:43

vvoland reviewed Oct 10, 2025

View reviewed changes

cli/command/plugin/completion.go Show resolved Hide resolved

robmry reviewed Oct 10, 2025

View reviewed changes

This was referenced Oct 10, 2025

client: Filters: add Clone method moby/moby#51163

Merged

remove API-version compatibility for API < v1.44 #6551

Merged

thaJeztah requested review from robmry and vvoland October 10, 2025 17:17

robmry approved these changes Oct 10, 2025

View reviewed changes

thaJeztah force-pushed the bump_engine_take2 branch from 02f6cf5 to 08f4d82 Compare October 10, 2025 17:34

vendor: github.com/moby/moby/api, client 0769fe708773 (master)

f81816e

full diff: moby/moby@4ca8aed...0769fe7 Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah force-pushed the bump_engine_take2 branch from 08f4d82 to f81816e Compare October 10, 2025 17:35

thaJeztah changed the title ~~vendor: github.com/moby/moby/api, github.com/moby/moby/client master (takę 2)~~ vendor: github.com/moby/moby/api, client 0769fe708773 (master) Oct 10, 2025

thaJeztah marked this pull request as ready for review October 10, 2025 17:36

thaJeztah requested review from a team and silvin-lubecki as code owners October 10, 2025 17:36

thaJeztah merged commit a3e9545 into docker:master Oct 10, 2025
147 of 148 checks passed

thaJeztah deleted the bump_engine_take2 branch October 10, 2025 17:45

thaJeztah mentioned this pull request Oct 13, 2025

opts: FilterOpt: show empty string if no values are set #6559

Merged

		NetworkID string `json:",omitempty"`
		Addr netip.Prefix `json:",omitempty"`

		\| `--ip` \| `ip` \| `<nil>` \| IPv4 address (e.g., 172.30.100.104) \|
		\| `--ip6` \| `ip` \| `<nil>` \| IPv6 address (e.g., 2001:db8::33) \|

		pruneFilters := options.filter.Value().Clone()
		pruneFilters := maps.Clone(options.filter.Value())

	type ipamOptions struct {
	driver string
	subnets []string
	ipRanges []string
	gateways []string
	auxAddresses opts.MapOpts
	driverOpts opts.MapOpts
	}

	// IPAM represents IP Address Management
	type IPAM struct {
	Driver string
	Options map[string]string // Per network IPAM driver options
	Config []IPAMConfig
	}

	// IPAMConfig represents IPAM configurations
	type IPAMConfig struct {
	Subnet string `json:",omitempty"`
	IPRange string `json:",omitempty"`
	Gateway string `json:",omitempty"`
	AuxAddress map[string]string `json:"AuxiliaryAddresses,omitempty"`
	}

vendor: github.com/moby/moby/api, client 0769fe708773 (master) #6545

vendor: github.com/moby/moby/api, client 0769fe708773 (master) #6545

Uh oh!

Conversation

thaJeztah commented Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

vendor: github.com/moby/moby/api, github.com/moby/moby/client master

Uh oh!

thaJeztah Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Oct 9, 2025

Uh oh!

codecov-commenter commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

thaJeztah commented Oct 9, 2025

Uh oh!

thaJeztah commented Oct 9, 2025

Uh oh!

thaJeztah commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

robmry left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Oct 10, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

thaJeztah commented Oct 8, 2025 •

edited

Loading

thaJeztah Oct 8, 2025 •

edited

Loading

codecov-commenter commented Oct 9, 2025 •

edited

Loading

thaJeztah commented Oct 9, 2025 •

edited

Loading