summaryrefslogtreecommitdiff
path: root/cmd/podman/images
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2020-06-22 14:29:04 -0700
committerMatthew Heon <matthew.heon@pm.me>2020-07-06 14:14:53 -0400
commit8dd26289bf516dcfbd9aaad6d2dd65c9f84380c8 (patch)
treea60eae9ebbd9536d322a707bea2c760f9d94abf3 /cmd/podman/images
parentde6a8609a81472b5be786c7404576905ebb981fb (diff)
downloadpodman-8dd26289bf516dcfbd9aaad6d2dd65c9f84380c8.tar.gz
podman-8dd26289bf516dcfbd9aaad6d2dd65c9f84380c8.tar.bz2
podman-8dd26289bf516dcfbd9aaad6d2dd65c9f84380c8.zip
Fixes --remote flag issues
* --remote, --url and --identity are now anchored to podman command. Subcommands should no longer have issues * TraverseChildren now set to V1 expectations * Latest flag now has helper function. Now has consistent usage. * IsRemote() uses cobra parser to determin if --remote is given * Moved validation functions from parser pkg to validate pkg * Fixes #6598 Fixes #6704 Signed-off-by: Jhon Honce <jhonce@redhat.com> <MH: Fixed import issues> Signed-off-by: Matt Heon <matthew.heon@pm.me>
Diffstat (limited to 'cmd/podman/images')
-rw-r--r--cmd/podman/images/build.go10
-rw-r--r--cmd/podman/images/diff.go4
-rw-r--r--cmd/podman/images/image.go9
-rw-r--r--cmd/podman/images/search.go1
4 files changed, 12 insertions, 12 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 40a9a8e7f..3ea74b4af 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -40,11 +40,11 @@ var (
// Command: podman _diff_ Object_ID
buildDescription = "Builds an OCI or Docker image using instructions from one or more Containerfiles and a specified build context directory."
buildCmd = &cobra.Command{
- Use: "build [flags] [CONTEXT]",
- Short: "Build an image using instructions from Containerfiles",
- Long: buildDescription,
- TraverseChildren: true,
- RunE: build,
+ Use: "build [flags] [CONTEXT]",
+ Short: "Build an image using instructions from Containerfiles",
+ Long: buildDescription,
+ Args: cobra.MaximumNArgs(1),
+ RunE: build,
Example: `podman build .
podman build --creds=username:password -t imageName -f Containerfile.simple .
podman build --layers --force-rm --tag imageName .`,
diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go
index cd674ee9c..10a1c06ec 100644
--- a/cmd/podman/images/diff.go
+++ b/cmd/podman/images/diff.go
@@ -14,8 +14,8 @@ var (
diffCmd = &cobra.Command{
Use: "diff [flags] IMAGE",
Args: cobra.ExactArgs(1),
- Short: "Inspect changes on image's file systems",
- Long: `Displays changes on a image's filesystem. The image will be compared to its parent layer.`,
+ Short: "Inspect changes to the image's file systems",
+ Long: `Displays changes to the image's filesystem. The image will be compared to its parent layer.`,
RunE: diff,
Example: `podman image diff myImage
podman image diff --format json redis:alpine`,
diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go
index 85c1afc0e..89badd035 100644
--- a/cmd/podman/images/image.go
+++ b/cmd/podman/images/image.go
@@ -13,11 +13,10 @@ var (
// Command: podman _image_
imageCmd = &cobra.Command{
- Use: "image",
- Short: "Manage images",
- Long: "Manage images",
- TraverseChildren: true,
- RunE: validate.SubCommandExists,
+ Use: "image",
+ Short: "Manage images",
+ Long: "Manage images",
+ RunE: validate.SubCommandExists,
}
)
diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go
index 7c5bd890d..f1a2cda96 100644
--- a/cmd/podman/images/search.go
+++ b/cmd/podman/images/search.go
@@ -86,6 +86,7 @@ func searchFlags(flags *pflag.FlagSet) {
flags.BoolVar(&searchOptions.NoTrunc, "no-trunc", false, "Do not truncate the output")
flags.StringVar(&searchOptions.Authfile, "authfile", auth.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override")
flags.BoolVar(&searchOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries")
+
if registry.IsRemote() {
_ = flags.MarkHidden("authfile")
_ = flags.MarkHidden("tls-verify")