mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-10-14 09:57:41 +00:00
db23e12611
External containers are containers created outside of Podman. For example Buildah and CRI-O Containers. $ buildah from alpine alpine-working-container $ buildah run alpine-working-container touch /test $ podman container exists --external alpine-working-container $ podman container diff alpine-working-container C /etc A /test Added --external flag to refer to external containers, rather then --storage. Added --external for podman container exists and modified podman ps to use --external rather then --storage. It was felt that --storage would confuse the user into thinking about changing the storage driver or options. --storage is still supported through the use of aliases. Finally podman contianer diff, does not require the --external flag, since it there is little change of users making the mistake, and would just be a pain for the user to remember the flag. podman container exists --external is required because it could fool scripts that rely on the existance of a Podman container, and there is a potential for a partial deletion of a container, which could mess up existing users. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
67 lines
2 KiB
Go
67 lines
2 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/containers/podman/v2/cmd/podman/containers"
|
|
"github.com/containers/podman/v2/cmd/podman/images"
|
|
"github.com/containers/podman/v2/cmd/podman/registry"
|
|
"github.com/containers/podman/v2/cmd/podman/validate"
|
|
"github.com/containers/podman/v2/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.`
|
|
diffCmd = &cobra.Command{
|
|
Use: "diff [flags] {CONTAINER_ID | IMAGE_ID}",
|
|
Args: validate.IDOrLatestArgs,
|
|
Short: "Display the changes to the object's file system",
|
|
Long: diffDescription,
|
|
RunE: diff,
|
|
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{
|
|
Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
|
|
Command: diffCmd,
|
|
})
|
|
flags := diffCmd.Flags()
|
|
flags.BoolVar(&diffOpts.Archive, "archive", true, "Save the diff as a tar archive")
|
|
_ = flags.MarkHidden("archive")
|
|
flags.StringVar(&diffOpts.Format, "format", "", "Change the output format")
|
|
validate.AddLatestFlag(diffCmd, &diffOpts.Latest)
|
|
}
|
|
|
|
func diff(cmd *cobra.Command, args []string) error {
|
|
// Latest implies looking for a container
|
|
if diffOpts.Latest {
|
|
return containers.Diff(cmd, args, diffOpts)
|
|
}
|
|
|
|
options := entities.ContainerExistsOptions{
|
|
External: true,
|
|
}
|
|
if found, err := registry.ContainerEngine().ContainerExists(registry.GetContext(), args[0], options); err != nil {
|
|
return err
|
|
} else if found.Value {
|
|
return containers.Diff(cmd, args, diffOpts)
|
|
}
|
|
|
|
if found, err := registry.ImageEngine().Exists(registry.GetContext(), args[0]); err != nil {
|
|
return err
|
|
} else if found.Value {
|
|
return images.Diff(cmd, args, diffOpts)
|
|
}
|
|
|
|
return fmt.Errorf("%s not found on system", args[0])
|
|
}
|