0f2b709c7c
client.ContainerDiff already validates the given container name/ID, and
produces an error when empty, so we don't have to check for this;
abba330bbf/client/container_diff.go (L13-L16)
While updating, also;
- remove the diffOptions type, as there were no other options, and make
the container name/ID a string argument.
- fix camelCase nameing of dockerCLI
Before this patch:
docker diff ""
Container name cannot be empty
With this patch:
docker diff ""
invalid container name or ID: value is empty
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
40 lines
1.1 KiB
Go
40 lines
1.1 KiB
Go
package container
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/completion"
|
|
"github.com/docker/cli/cli/command/formatter"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
// NewDiffCommand creates a new cobra.Command for `docker diff`
|
|
func NewDiffCommand(dockerCli command.Cli) *cobra.Command {
|
|
return &cobra.Command{
|
|
Use: "diff CONTAINER",
|
|
Short: "Inspect changes to files or directories on a container's filesystem",
|
|
Args: cli.ExactArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
return runDiff(cmd.Context(), dockerCli, args[0])
|
|
},
|
|
Annotations: map[string]string{
|
|
"aliases": "docker container diff, docker diff",
|
|
},
|
|
ValidArgsFunction: completion.ContainerNames(dockerCli, false),
|
|
}
|
|
}
|
|
|
|
func runDiff(ctx context.Context, dockerCLI command.Cli, containerID string) error {
|
|
changes, err := dockerCLI.Client().ContainerDiff(ctx, containerID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
diffCtx := formatter.Context{
|
|
Output: dockerCLI.Out(),
|
|
Format: NewDiffFormat("{{.Type}} {{.Path}}"),
|
|
}
|
|
return DiffFormatWrite(diffCtx, changes)
|
|
}
|