cli/command/container: don't set CopyToContainerOptions.AllowOverwriteDirWithFile

The `AllowOverwriteDirWithFile` option was added when reimplementing the
CLI using the API Client lib in [moby@1b2b91b]. Before that refactor, the
`noOverwriteDirNonDir` query argument [would be set unconditionally][1]
by the CLI, with no options to control the behavior.

It's unclear why the `noOverwriteDirNonDir` was implemented as opt-in (not
opt-out), as overwriting a file with a directory (or vice-versa) would
generally be unexpected behavior.

We're considering making `noOverwriteDirNonDir` unconditional on the daemon
side, and to deprecate the `AllowOverwriteDirWithFile` option. This patch
removes its use, as it was set to the default either way, and there's no
options to configure it from the CLI.

[1]: https://github.com/moby/moby/blob/8c9ad7b818c0a7b1e39f8df1fabba243a0961c2d/api/client/cp.go#L345-L346
[moby@1b2b91b]: https://github.com/moby/moby/commit/1b2b91ba43dc6fa1b4b758fc5a8090ce6cc597ff

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

This commit is contained in:

Sebastiaan van Stijn

2025-07-13 13:48:59 +02:00

parent c69d8bde4a

commit 0be687acc0

1 changed files with 1 additions and 2 deletions

									
										cli/command/container/cp.go
									
		+1
		-2
	
												View File
												
				@@ -398,8 +398,7 @@ func copyToContainer(ctx context.Context, dockerCLI command.Cli, copyConfig cpCo

					}

					options := container.CopyToContainerOptions{

						AllowOverwriteDirWithFile: false,

						CopyUIDGID:                copyConfig.copyUIDGID,

						CopyUIDGID: copyConfig.copyUIDGID,

					}

					if copyConfig.quiet {