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

…

links

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

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

listeners

…

logger

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

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

names

…

network

…

snapshotter

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

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

stats

…

testdata

Improve CPU usage parsing and error reporting

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

apparmor_default_unsupported.go

…

apparmor_default.go

…

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

…

attach.go

daemon: daemon.containerAttach: use structured logs

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

auth.go

…

build.go

…

cdi.go

…

changes.go

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

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

checkpoint.go

…

cluster.go

…

commit.go

…

configs.go

…

container_linux.go

…

container_operations_test.go

…

container_operations_unix.go

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

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

container_operations_windows.go

…

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

…

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

…

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

…

daemon_linux.go

daemon: fix naked returns

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

daemon_test.go

…

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

…

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

…

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

…

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

…

exec_windows.go

…

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

…

health.go

Merge pull request #49337 from thaJeztah/simplify_health_getshell

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

hosts_test.go

…

hosts.go

…

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

…

info_unix.go

Add an opt-out for iptables 'raw' rules

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

info_windows.go

…

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

…

inspect_test.go

…

inspect_windows.go

…

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

…

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

…

logdrivers_windows.go

…

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

…

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

…

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

…

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

…

oci_utils.go

…

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

…

pause.go

…

prune.go

…

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

…

resize_test.go

…

resize.go

…

restart.go

…

runtime_unix_test.go

…

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

…

seccomp_unsupported.go

…

secrets.go

…

start_linux.go

daemon: handleContainerExit: ignore networking errors

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

start_notlinux.go

…

start_unix.go

…

start_windows.go

…

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

…

stats.go

…

stop.go

…

top_unix_test.go

…

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

…

update_linux_test.go

…

update_linux.go

…

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

…

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