summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2018-12-12 14:29:40 -0500
committerTomSweeneyRedHat <tsweeney@redhat.com>2018-12-17 11:08:54 -0500
commit92c7f4eb9e50d0b35aa048c5149cb95ce5c4e507 (patch)
tree139136aa182ffaf7f3a1e6e3d3799aad7ba3563f
parenta1902dc48b11573ac35fa69ebdfe09def4857efd (diff)
downloadpodman-92c7f4eb9e50d0b35aa048c5149cb95ce5c4e507.tar.gz
podman-92c7f4eb9e50d0b35aa048c5149cb95ce5c4e507.tar.bz2
podman-92c7f4eb9e50d0b35aa048c5149cb95ce5c4e507.zip
Show image only once with images -q
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
-rw-r--r--cmd/podman/images.go6
-rw-r--r--test/README.md2
-rw-r--r--test/e2e/images_test.go4
3 files changed, 11 insertions, 1 deletions
diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index 3351123ed..a1aeb6042 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -280,7 +280,9 @@ func getImagesTemplateOutput(ctx context.Context, runtime *libpod.Runtime, image
if !opts.noTrunc {
imageID = shortID(img.ID())
}
+
// get all specified repo:tag pairs and print them separately
+ outer:
for repo, tags := range image.ReposToMap(img.Names()) {
for _, tag := range tags {
size, err := img.Size(ctx)
@@ -302,6 +304,10 @@ func getImagesTemplateOutput(ctx context.Context, runtime *libpod.Runtime, image
Size: sizeStr,
}
imagesOutput = append(imagesOutput, params)
+ if opts.quiet { // Show only one image ID when quiet
+ break outer
+ }
+
}
}
}
diff --git a/test/README.md b/test/README.md
index 2a9a4d4b1..fd72ecd00 100644
--- a/test/README.md
+++ b/test/README.md
@@ -79,7 +79,7 @@ switch is optional.
You can run a single file of integration tests using the go test command:
```
-GOPATH=~/go go test -v test/e2e/libpod_suite_test.go test/e2e/your_test.go
+GOPATH=~/go go test -v test/e2e/libpod_suite_test.go test/e2e/config.go test/e2e/config_amd64.go test/e2e/your_test.go
```
#### Run all tests like PAPR
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index a927088ca..af32c032b 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -63,6 +63,10 @@ var _ = Describe("Podman images", func() {
session.LineInOutputContainsTag("foo", "c")
session.LineInOutputContainsTag("bar", "a")
session.LineInOutputContainsTag("bar", "b")
+ session = podmanTest.Podman([]string{"images", "-qn"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 2))
})
It("podman images with digests", func() {