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]:8c9ad7b818/api/client/cp.go (L345-L346)[moby@1b2b91b]:1b2b91ba43Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user