Rob Murray 37725b5eae Drop "-o com.docker.network.enable_ipv[46]" if overridden ...

When a network is created with "-o com.docker.network.enable_ipv4'
(including via "default-network-opts" in daemon config), and
EnableIPv4 is present in the API request (including when CLI option
"--ipv4" is used) - the top-level API value is used and the '-o'
is ignored.

But, the "-o" still shows up in Options in inspect output, which is
confusing if the values are different.

So, drop the "-o" if the top-level API option is set. Ditto IPv6.

Signed-off-by: Rob Murray <rob.murray@docker.com>

2025-04-25 11:21:13 +01:00

..

cluster

deprecate pkg/atomicwriter, migrate to github.com/moby/sys/atomicwriter

2025-04-04 23:07:00 +02:00

config

testing: remove some defer cleanup in favor of test.Cleanup()

2025-04-19 16:35:24 +02:00

containerd

fix duplicate import, and force consistent alias for bolt

2025-04-22 11:31:10 +02:00

events

daemon/events: make switches exhaustive (exhaustive)

2025-02-09 13:22:52 +01:00

graphdriver

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

images

fix duplicate import, and force consistent alias for bolt

2025-04-22 11:31:10 +02:00

initlayer

daemon/initlayer: Setup: remove uses of idtools.Identity

2025-04-16 09:58:24 +02:00

internal

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

links

daemon/links: fix duplicate env-vars and cleanup range-detection

2025-01-20 11:52:41 +01:00

listeners

Update internal use of idtools to usergroup

2025-01-07 11:18:46 -08:00

logger

testing: remove some defer cleanup in favor of test.Cleanup()

2025-04-19 16:35:24 +02:00

names

daemon/names: use lazyregexp

2025-01-02 21:37:35 +01:00

network

runconfig: deprecate IsPreDefinedNetwork

2024-06-20 11:10:54 +02:00

snapshotter

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

stats

api/types: move stats-types to api/types/container

2024-06-20 10:21:42 +02:00

testdata

Improve CPU usage parsing and error reporting

2025-04-07 16:19:02 +02:00

apparmor_default_unsupported.go

…

apparmor_default.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

archive_tarcopyoptions_unix.go

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

archive_tarcopyoptions.go

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

archive_unix.go

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

archive_windows.go

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

archive.go

daemon: don't discard "invalid parameter" errors for archive endpoints

2025-01-16 20:58:32 +01:00

attach.go

daemon: daemon.containerAttach: use structured logs

2025-03-23 13:29:27 +01:00

auth.go

…

build.go

daemon: ImageService.LogImageEvent: pass through context

2025-01-08 15:43:17 +01:00

cdi.go

Merge pull request #48771 from thaJeztah/cdi_noshadow

2024-10-28 10:30:23 +01:00

changes.go

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

checkpoint.go

…

cluster.go

api/types: migrate NetworkResource to api/types/network

2024-06-04 17:44:46 +02:00

commit.go

daemon/metrics: Move out to internal/metrics

2025-01-07 14:13:06 +01:00

configs.go

daemon: remove configsSupported utility

2024-10-20 14:04:07 +02:00

container_linux.go

…

container_operations_test.go

Unconditionally update NetworkSettings

2024-11-05 10:00:10 +00:00

container_operations_unix.go

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

container_operations_windows.go

Remove function isLinkable

2024-11-05 14:22:53 +00:00

container_operations.go

update go:build tags to go1.23 to align with vendor.mod

2025-04-17 15:43:19 +02:00

container_unix_test.go

…

container_windows.go

…

container.go

daemon: Fix panic on Windows when restoring pre v28 container

2025-03-11 12:25:42 +01:00

containerfs_linux.go

Fix typos

2024-09-06 21:53:09 +10:00

content.go

fix duplicate import, and force consistent alias for bolt

2025-04-22 11:31:10 +02:00

create_unix.go

container: Container.SetupWorkingDirectory: remove use of pkg/idtools

2025-04-10 12:30:34 +02:00

create_windows.go

volumes/subpath: Plumb context

2024-01-19 17:32:21 +01:00

create.go

update go:build tags to go1.23 to align with vendor.mod

2025-04-17 15:43:19 +02:00

daemon_linux_test.go

Separate IPv4 IPAM conf from the rest of default bridge conf

2024-11-25 18:28:37 +00:00

daemon_linux.go

daemon: fix naked returns

2025-03-04 13:56:14 +01:00

daemon_test.go

daemon: add ULA prefix by default

2024-05-29 22:38:27 +02:00

daemon_unix_test.go

daemon/&container/: enable --security-opt writable-cgroups=true as an option

2025-01-16 12:58:17 -08:00

daemon_unix.go

update go:build tags to go1.23 to align with vendor.mod

2025-04-17 15:43:19 +02:00

daemon_unsupported.go

Revert "Internal resolver for default bridge network"

2024-06-17 20:19:20 +01:00

daemon_windows_test.go

…

daemon_windows.go

daemon/initlayer: Setup: remove uses of idtools.Identity

2025-04-16 09:58:24 +02:00

daemon.go

fix duplicate import, and force consistent alias for bolt

2025-04-22 11:31:10 +02:00

debugtrap_unix.go

…

debugtrap_unsupported.go

…

debugtrap_windows.go

…

delete_test.go

daemon: remove redundant capturing of loop vars (copyloopvar)

2024-11-12 14:02:15 +01:00

delete.go

daemon: Daemon.rmLink: don't fuzzy-match container when using ID

2025-01-30 11:39:19 +01:00

dependency.go

…

devices.go

remove redundant alias for runtime-spec

2024-10-26 18:31:39 +02:00

disk_usage.go

API: add Platform (OS and Architecture) to /containers/json

2025-02-13 14:52:21 -06:00

errors_test.go

…

errors.go

…

events_test.go

…

events.go

daemon: eventTimestamp: make switch exhaustive (exhaustive)

2025-02-09 13:22:51 +01:00

exec_linux_test.go

remove some redundant import-aliases

2025-03-24 00:43:31 +01:00

exec_linux.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

exec_windows.go

container: Add ImagePlatform field and deprecate OS

2024-11-19 13:55:54 +01:00

exec.go

daemon: make daemon.getEntrypointAndArgs a regular function

2025-01-26 14:37:08 +01:00

export.go

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

health_test.go

api/types: move container Health types to api/types/container

2024-07-02 12:46:47 +02:00

health.go

Merge pull request #49337 from thaJeztah/simplify_health_getshell

2025-01-27 15:55:56 +00:00

hosts_test.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

hosts.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

id.go

deprecate pkg/atomicwriter, migrate to github.com/moby/sys/atomicwriter

2025-04-04 23:07:00 +02:00

image_service.go

Update to use github.com/moby/go-archive

2025-04-08 17:35:05 -07:00

info_unix_test.go

daemon: remove redundant capturing of loop vars (copyloopvar)

2024-11-12 14:02:15 +01:00

info_unix.go

Add an opt-out for iptables 'raw' rules

2025-03-10 18:32:49 +00:00

info_windows.go

Remove feature flag "windows-dns-proxy"

2024-10-24 11:19:42 +01:00

info.go

update go:build tags to go1.23 to align with vendor.mod

2025-04-17 15:43:19 +02:00

inspect_linux.go

api/types/container: InspectResponse: keep old name for embedded type

2024-07-03 17:14:03 +02:00

inspect_test.go

…

inspect_windows.go

api/types/container: InspectResponse: keep old name for embedded type

2024-07-03 17:14:03 +02:00

inspect.go

update go:build tags to go1.23 to align with vendor.mod

2025-04-17 15:43:19 +02:00

keys_unsupported.go

…

keys.go

…

kill.go

daemon: killWithSignal: use more structured logs

2024-10-15 22:40:39 +02:00

licensing_test.go

…

licensing.go

…

links.go

…

list_test.go

Improve performance of daemon.Containers().

2025-03-12 09:59:52 -07:00

list_unix.go

…

list_windows.go

…

list.go

Improve performance of daemon.Containers().

2025-03-12 09:59:52 -07:00

logdrivers_linux.go

logger: remove logentries driver

2023-12-12 22:51:23 +01:00

logdrivers_windows.go

logger: remove logentries driver

2023-12-12 22:51:23 +01:00

logs_test.go

…

logs.go

daemon: daemon.ContainerLogs: move vars closer to where used

2025-03-23 13:11:39 +01:00

migration_test.go

daemon: gofumpt code

2024-11-28 10:03:46 +01:00

migration.go

daemon: Fix panic on Windows when restoring pre v28 container

2025-03-11 12:25:42 +01:00

monitor.go

daemon: handleContainerExit: ignore networking errors

2025-02-20 18:03:20 +01:00

mounts.go

Implement image mount for the snapshotter

2025-01-31 10:34:27 -05:00

names.go

Merge pull request #48669 from thaJeztah/daemon_fix_restore

2024-10-18 12:59:08 +02:00

network_windows.go

…

network.go

Drop "-o com.docker.network.enable_ipv[46]" if overridden

2025-04-25 11:21:13 +01:00

nvidia_linux.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

oci_linux_test.go

libnet: New: plumb context

2025-04-09 08:45:33 +02:00

oci_linux.go

container: Container.SetupWorkingDirectory: remove use of pkg/idtools

2025-04-10 12:30:34 +02:00

oci_opts.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

oci_utils.go

remove redundant alias for runtime-spec

2024-10-26 18:31:39 +02:00

oci_windows_test.go

testing: remove some defer cleanup in favor of test.Cleanup()

2025-04-19 16:35:24 +02:00

oci_windows.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

pause.go

container: add a span to CheckpointTo

2024-06-14 15:25:07 +02:00

prune.go

daemon: use lazyregexp to compile regexes on first use

2025-01-02 21:37:33 +01:00

reload_test.go

libnet: New: plumb context

2025-04-09 08:45:33 +02:00

reload_unix.go

…

reload_windows.go

…

reload.go

daemon: use structured logs for printing reloaded config, move to cli

2025-02-14 12:22:10 +01:00

rename.go

daemon: rename some inconsistent import aliases

2024-06-17 14:50:09 +02:00

resize_test.go

api: backend.ContainerExecResize: pass context and use uint32 for width, height

2024-10-17 14:04:37 +02:00

resize.go

api: backend.ContainerExecResize: pass context and use uint32 for width, height

2024-10-17 14:04:37 +02:00

restart.go

remove internal/compatcontext and use context instead

2024-06-13 13:29:39 +02:00

runtime_unix_test.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

runtime_unix.go

deprecate pkg/atomicwriter, migrate to github.com/moby/sys/atomicwriter

2025-04-04 23:07:00 +02:00

runtime_windows.go

…

seccomp_linux_test.go

remove some redundant import-aliases

2025-03-24 00:43:31 +01:00

seccomp_linux.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

seccomp_unsupported.go

Update to containerd v2.0.2, buildkit v0.19.0-rc2

2025-01-15 14:09:30 +01:00

secrets.go

daemon: remove secretsSupported utility

2024-10-20 14:10:17 +02:00

start_linux.go

daemon: handleContainerExit: ignore networking errors

2025-02-20 18:03:20 +01:00

start_notlinux.go

Configure network endpoints after creating a container

2024-11-05 10:01:49 +00:00

start_unix.go

container: add a span to CheckpointTo

2024-06-14 15:25:07 +02:00

start_windows.go

Windows: Run containerd as managed process

2024-11-06 21:04:31 +03:00

start.go

daemon: containerStart: add filtered labels to OTel span

2025-04-10 19:12:25 +02:00

stats_collector.go

…

stats_unix_test.go

Improve CPU usage parsing and error reporting

2025-04-07 16:19:02 +02:00

stats_unix.go

Improve CPU usage parsing and error reporting

2025-04-07 16:19:02 +02:00

stats_windows.go

api/types/container: merge Stats and StatsResponse

2025-01-16 19:47:40 +01:00

stats.go

api/types: move stats-types to api/types/container

2024-06-20 10:21:42 +02:00

stop.go

remove internal/compatcontext and use context instead

2024-06-13 13:29:39 +02:00

top_unix_test.go

daemon: remove redundant capturing of loop vars (copyloopvar)

2024-11-12 14:02:15 +01:00

top_unix.go

api/types/container: rename ContainerTopOKBody to TopResponse

2025-02-10 18:58:31 +01:00

top_windows.go

api/types/container: rename ContainerTopOKBody to TopResponse

2025-02-10 18:58:31 +01:00

unpause.go

container: add a span to CheckpointTo

2024-06-14 15:25:07 +02:00

update_linux_test.go

…

update_linux.go

remove redundant alias for runtime-spec

2024-10-26 18:31:39 +02:00

update_windows.go

…

update.go

api/types/container: rename ContainerUpdateOKBody to UpdateResponse

2025-02-10 18:35:35 +01:00

volumes_linux_test.go

…

volumes_linux.go

…

volumes_unit_test.go

…

volumes_unix.go

Update daemon to use moby sys/user identity mapping

2025-04-04 08:24:09 -07:00

volumes_windows.go

daemon: move sortMounts to a platform-agnostic file

2024-07-26 13:50:13 +02:00

volumes.go

Implement mount from image

2025-01-31 10:34:27 -05:00

wait.go

…

workdir.go

container: Container.SetupWorkingDirectory: remove use of pkg/idtools

2025-04-10 12:30:34 +02:00