summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-07-13 15:48:42 -0400
committerGitHub <noreply@github.com>2021-07-13 15:48:42 -0400
commit9d98f56a64852d3bf9d3b27ad6e1ac3e3ebb6622 (patch)
treee1c760679698947ed9b5e849ffee78d9fcfe0a15
parent1611e0e5a335a024d1e58b7fc36fb0f931e13799 (diff)
parent6ca574dc3ab6d517257482d81b3ad6a6bbf81c43 (diff)
downloadpodman-9d98f56a64852d3bf9d3b27ad6e1ac3e3ebb6622.tar.gz
podman-9d98f56a64852d3bf9d3b27ad6e1ac3e3ebb6622.tar.bz2
podman-9d98f56a64852d3bf9d3b27ad6e1ac3e3ebb6622.zip
Merge pull request #10901 from rsevilla87/manifest-create-args
manifest create subcommand should accept more than 2 arguments
-rw-r--r--cmd/podman/manifest/create.go5
-rw-r--r--test/e2e/manifest_test.go6
2 files changed, 9 insertions, 2 deletions
diff --git a/cmd/podman/manifest/create.go b/cmd/podman/manifest/create.go
index 9f7d74d14..95c9f89b0 100644
--- a/cmd/podman/manifest/create.go
+++ b/cmd/podman/manifest/create.go
@@ -13,15 +13,16 @@ import (
var (
manifestCreateOpts = entities.ManifestCreateOptions{}
createCmd = &cobra.Command{
- Use: "create [options] LIST [IMAGE]",
+ Use: "create [options] LIST [IMAGE...]",
Short: "Create manifest list or image index",
Long: "Creates manifest lists or image indexes.",
RunE: create,
ValidArgsFunction: common.AutocompleteImages,
Example: `podman manifest create mylist:v1.11
podman manifest create mylist:v1.11 arch-specific-image-to-add
+ podman manifest create mylist:v1.11 arch-specific-image-to-add another-arch-specific-image-to-add
podman manifest create --all mylist:v1.11 transport:tagged-image-to-add`,
- Args: cobra.RangeArgs(1, 2),
+ Args: cobra.MinimumNArgs(1),
}
)
diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go
index b2dc4f734..8c1ea4134 100644
--- a/test/e2e/manifest_test.go
+++ b/test/e2e/manifest_test.go
@@ -50,6 +50,12 @@ var _ = Describe("Podman manifest", func() {
Expect(session.ExitCode()).To(Equal(0))
})
+ It("podman manifest create", func() {
+ session := podmanTest.Podman([]string{"manifest", "create", "foo", imageList})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ })
+
It("podman manifest inspect", func() {
session := podmanTest.Podman([]string{"manifest", "inspect", BB})
session.WaitWithDefaultTimeout()