mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-08-05 16:35:45 +00:00
8f6a0243f4
First, make podman diff accept optionally a second argument. This allows the user to specify a second image/container to compare the first with. If it is not set the parent layer will be used as before. Second, podman container diff should only use containers and podman image diff should only use images. Previously, podman container diff would use the image when both an image and container with this name exists. To make this work two new parameters have been added to the api. If they are not used the previous behaviour is used. The same applies to the bindings. Fixes #10649 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
52 lines
1.8 KiB
Go
52 lines
1.8 KiB
Go
package main
|
|
|
|
import (
|
|
"github.com/containers/podman/v3/cmd/podman/common"
|
|
"github.com/containers/podman/v3/cmd/podman/diff"
|
|
"github.com/containers/podman/v3/cmd/podman/registry"
|
|
"github.com/containers/podman/v3/cmd/podman/validate"
|
|
"github.com/containers/podman/v3/libpod/define"
|
|
"github.com/containers/podman/v3/pkg/domain/entities"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
// Inspect is one of the outlier commands in that it operates on images/containers/...
|
|
|
|
var (
|
|
// Command: podman _diff_ Object_ID
|
|
diffDescription = `Displays changes on a container or image's filesystem. The container or image will be compared to its parent layer or the second argument when given.`
|
|
diffCmd = &cobra.Command{
|
|
Use: "diff [options] {CONTAINER|IMAGE} [{CONTAINER|IMAGE}]",
|
|
Args: diff.ValidateContainerDiffArgs,
|
|
Short: "Display the changes to the object's file system",
|
|
Long: diffDescription,
|
|
RunE: diffRun,
|
|
ValidArgsFunction: common.AutocompleteContainersAndImages,
|
|
Example: `podman diff imageID
|
|
podman diff ctrID
|
|
podman diff --format json redis:alpine`,
|
|
}
|
|
|
|
diffOpts = entities.DiffOptions{}
|
|
)
|
|
|
|
func init() {
|
|
registry.Commands = append(registry.Commands, registry.CliCommand{
|
|
Command: diffCmd,
|
|
})
|
|
flags := diffCmd.Flags()
|
|
// FIXME: Why does this exists? It is not used anywhere.
|
|
flags.BoolVar(&diffOpts.Archive, "archive", true, "Save the diff as a tar archive")
|
|
_ = flags.MarkHidden("archive")
|
|
|
|
formatFlagName := "format"
|
|
flags.StringVar(&diffOpts.Format, formatFlagName, "", "Change the output format (json)")
|
|
_ = diffCmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteFormat(nil))
|
|
|
|
validate.AddLatestFlag(diffCmd, &diffOpts.Latest)
|
|
}
|
|
|
|
func diffRun(cmd *cobra.Command, args []string) error {
|
|
diffOpts.Type = define.DiffAll
|
|
return diff.Diff(cmd, args, diffOpts)
|
|
}
|