summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorumohnani8 <umohnani@redhat.com>2017-11-28 09:34:07 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-28 16:09:13 +0000
commita1d0d9f5d1d72f3ca0d1d2af36f9542f6f21ff91 (patch)
tree1df7ab15e1d1c8075e4c081f2eb18e09624f3087
parentc0eceaa403a739355c6e2715b3354f7b15f35fb8 (diff)
downloadpodman-a1d0d9f5d1d72f3ca0d1d2af36f9542f6f21ff91.tar.gz
podman-a1d0d9f5d1d72f3ca0d1d2af36f9542f6f21ff91.tar.bz2
podman-a1d0d9f5d1d72f3ca0d1d2af36f9542f6f21ff91.zip
Update man pages and output for kpod images
The size had a precision of 4, but wanted a precision of 3 to match the output of docker images updated the man page with more examples vendored in new version of docker/go-units to allow for customized precisions Signed-off-by: umohnani8 <umohnani@redhat.com> Closes: #82 Approved by: rhatdan
-rw-r--r--cmd/kpod/images.go2
-rw-r--r--docs/kpod-images.1.md87
-rw-r--r--vendor.conf2
3 files changed, 78 insertions, 13 deletions
diff --git a/cmd/kpod/images.go b/cmd/kpod/images.go
index 4ab44365f..71bc877c9 100644
--- a/cmd/kpod/images.go
+++ b/cmd/kpod/images.go
@@ -218,7 +218,7 @@ func getImagesTemplateOutput(runtime *libpod.Runtime, images []*storage.Image, o
ID: imageID,
Digest: imageDigest,
Created: units.HumanDuration(time.Since((createdTime))) + " ago",
- Size: units.HumanSize(float64(size)),
+ Size: units.HumanSizeWithPrecision(float64(size), 3),
}
imagesOutput = append(imagesOutput, params)
}
diff --git a/docs/kpod-images.1.md b/docs/kpod-images.1.md
index 96408090d..b852e047b 100644
--- a/docs/kpod-images.1.md
+++ b/docs/kpod-images.1.md
@@ -41,17 +41,82 @@ Lists only the image IDs.
## EXAMPLE
-kpod images
-
-kpod images --quiet
-
-kpod images -q --noheading --notruncate
-
-kpod images --format json
-
-kpod images --format "{{.ID}}"
-
-kpod images --filter dangling=true
+```
+# kpod images
+REPOSITORY TAG IMAGE ID CREATED SIZE
+docker.io/kubernetes/pause latest e3d42bcaf643 3 years ago 251kB
+<none> <none> ebb91b73692b 4 weeks ago 27.2MB
+docker.io/library/ubuntu latest 4526339ae51c 6 weeks ago 126MB
+```
+
+```
+# kpod images --quiet
+e3d42bcaf643
+ebb91b73692b
+4526339ae51c
+```
+
+```
+# kpod images --noheading
+docker.io/kubernetes/pause latest e3d42bcaf643 3 years ago 251kB
+<none> <none> ebb91b73692b 4 weeks ago 27.2MB
+docker.io/library/ubuntu latest 4526339ae51c 6 weeks ago 126MB
+```
+
+```
+# kpod images --no-trunc
+REPOSITORY TAG IMAGE ID CREATED SIZE
+docker.io/kubernetes/pause latest sha256:e3d42bcaf643097dd1bb0385658ae8cbe100a80f773555c44690d22c25d16b27 3 years ago 251kB
+<none> <none> sha256:ebb91b73692bd27890685846412ae338d13552165eacf7fcd5f139bfa9c2d6d9 4 weeks ago 27.2MB
+docker.io/library/ubuntu latest sha256:4526339ae51c3cdc97956a7a961c193c39dfc6bd9733b0d762a36c6881b5583a 6 weeks ago 126MB
+```
+
+```
+# kpod images --format "table {{.ID}} {{.Repository}} {{.Tag}}"
+IMAGE ID REPOSITORY TAG
+e3d42bcaf643 docker.io/kubernetes/pause latest
+ebb91b73692b <none> <none>
+4526339ae51c docker.io/library/ubuntu latest
+```
+
+```
+# kpod images --filter dangling=true
+REPOSITORY TAG IMAGE ID CREATED SIZE
+<none> <none> ebb91b73692b 4 weeks ago 27.2MB
+```
+
+```
+# kpod images --format json
+[
+ {
+ "id": "e3d42bcaf643097dd1bb0385658ae8cbe100a80f773555c44690d22c25d16b27",
+ "names": [
+ "docker.io/kubernetes/pause:latest"
+ ],
+ "digest": "sha256:0aecf73ff86844324847883f2e916d3f6984c5fae3c2f23e91d66f549fe7d423",
+ "created": "2014-07-19T07:02:32.267701596Z",
+ "size": 250665
+ },
+ {
+ "id": "ebb91b73692bd27890685846412ae338d13552165eacf7fcd5f139bfa9c2d6d9",
+ "names": [
+ "\u003cnone\u003e"
+ ],
+ "digest": "sha256:ba7e4091d27e8114a205003ca6a768905c3395d961624a2c78873d9526461032",
+ "created": "2017-10-26T03:07:22.796184288Z",
+ "size": 27170520
+ },
+ {
+ "id": "4526339ae51c3cdc97956a7a961c193c39dfc6bd9733b0d762a36c6881b5583a",
+ "names": [
+ "docker.io/library/ubuntu:latest"
+ ],
+ "digest": "sha256:193f7734ddd68e0fb24ba9af8c2b673aecb0227b026871f8e932dab45add7753",
+ "created": "2017-10-10T20:59:05.10196344Z",
+ "size": 126085200
+ }
+]
+```
## SEE ALSO
kpod(1)
diff --git a/vendor.conf b/vendor.conf
index 922b155d8..592c1b64c 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -23,7 +23,7 @@ gopkg.in/yaml.v2 v2
github.com/docker/docker ce452fb72ffcdb7605ce98bde9302238f47c63c5
github.com/docker/spdystream ed496381df8283605c435b86d4fdd6f4f20b8c6e
github.com/docker/distribution 7a8efe719e55bbfaff7bc5718cdf0ed51ca821df
-github.com/docker/go-units v0.3.1
+github.com/docker/go-units v0.3.2
github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d
github.com/docker/libtrust aabc10ec26b754e797f9028f4589c5b7bd90dc20
github.com/mistifyio/go-zfs v2.1.1