Skip to content

Commit

Permalink
Merge pull request #1803 from QiWang19/issuebuildah1051
Browse files Browse the repository at this point in the history 
Add space between num & unit in images output
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Nov 12, 2018
2 parents a4cc7bc + b6fabf1 commit 7965716
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 24 deletions.
6 changes: 4 additions & 2 deletions cmd/podman/images.go
View file
Expand Up @@ -6,8 +6,7 @@ import (
"sort"
"strings"
"time"

"github.com/sirupsen/logrus"
"unicode"

"github.com/containers/libpod/cmd/podman/formats"
"github.com/containers/libpod/cmd/podman/libpodruntime"
Expand All @@ -16,6 +15,7 @@ import (
"github.com/docker/go-units"
digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)

Expand Down Expand Up @@ -289,6 +289,8 @@ func getImagesTemplateOutput(ctx context.Context, runtime *libpod.Runtime, image
sizeStr = err.Error()
} else {
sizeStr = units.HumanSizeWithPrecision(float64(*size), 3)
lastNumIdx := strings.LastIndexFunc(sizeStr, unicode.IsNumber)
sizeStr = sizeStr[:lastNumIdx+1] + " " + sizeStr[lastNumIdx+1:]
}
params := imagesTemplateParams{
Repository: repo,
Expand Down
44 changes: 22 additions & 22 deletions docs/podman-images.1.md
View file
Expand Up @@ -49,9 +49,9 @@ Sort by created, id, repository, size or tag (default: created)
```
# podman 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
docker.io/kubernetes/pause latest e3d42bcaf643 3 years ago 251 kB
<none> <none> ebb91b73692b 4 weeks ago 27.2 MB
docker.io/library/ubuntu latest 4526339ae51c 6 weeks ago 126 MB
```

```
Expand All @@ -63,17 +63,17 @@ ebb91b73692b

```
# podman 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
docker.io/kubernetes/pause latest e3d42bcaf643 3 years ago 251 kB
<none> <none> ebb91b73692b 4 weeks ago 27.2 MB
docker.io/library/ubuntu latest 4526339ae51c 6 weeks ago 126 MB
```

```
# podman 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
docker.io/kubernetes/pause latest sha256:e3d42bcaf643097dd1bb0385658ae8cbe100a80f773555c44690d22c25d16b27 3 years ago 251 kB
<none> <none> sha256:ebb91b73692bd27890685846412ae338d13552165eacf7fcd5f139bfa9c2d6d9 4 weeks ago 27.2 MB
docker.io/library/ubuntu latest sha256:4526339ae51c3cdc97956a7a961c193c39dfc6bd9733b0d762a36c6881b5583a 6 weeks ago 126 MB
```

```
Expand All @@ -87,7 +87,7 @@ ebb91b73692b <none> <none>
```
# podman images --filter dangling=true
REPOSITORY TAG IMAGE ID CREATED SIZE
<none> <none> ebb91b73692b 4 weeks ago 27.2MB
<none> <none> ebb91b73692b 4 weeks ago 27.2 MB
```

```
Expand Down Expand Up @@ -126,25 +126,25 @@ REPOSITORY TAG IMAGE ID CREATED SIZE
```
# podman images --sort repository
REPOSITORY TAG IMAGE ID CREATED SIZE
<none> <none> 2460217d76fc About a minute ago 4.41MB
docker.io/library/alpine latest 3fd9065eaf02 5 months ago 4.41MB
localhost/myapp latest b2e0ad03474a About a minute ago 4.41MB
registry.access.redhat.com/rhel7 latest 7a840db7f020 2 weeks ago 211MB
registry.fedoraproject.org/fedora 27 801894bc0e43 6 weeks ago 246MB
<none> <none> 2460217d76fc About a minute ago 4.41 MB
docker.io/library/alpine latest 3fd9065eaf02 5 months ago 4.41 MB
localhost/myapp latest b2e0ad03474a About a minute ago 4.41 MB
registry.access.redhat.com/rhel7 latest 7a840db7f020 2 weeks ago 211 MB
registry.fedoraproject.org/fedora 27 801894bc0e43 6 weeks ago 246 MB
```

```
# podman images
REPOSITORY TAG IMAGE ID CREATED SIZE
localhost/test latest 18f0c080cd72 4 seconds ago 4.42MB
docker.io/library/alpine latest 3fd9065eaf02 5 months ago 4.41MB
localhost/test latest 18f0c080cd72 4 seconds ago 4.42 MB
docker.io/library/alpine latest 3fd9065eaf02 5 months ago 4.41 MB
# podman images -a
REPOSITORY TAG IMAGE ID CREATED SIZE
localhost/test latest 18f0c080cd72 6 seconds ago 4.42MB
<none> <none> 270e70dc54c0 7 seconds ago 4.42MB
<none> <none> 4ed6fbe43414 8 seconds ago 4.41MB
<none> <none> 6b0df8e71508 8 seconds ago 4.41MB
docker.io/library/alpine latest 3fd9065eaf02 5 months ago 4.41MB
localhost/test latest 18f0c080cd72 6 seconds ago 4.42 MB
<none> <none> 270e70dc54c0 7 seconds ago 4.42 MB
<none> <none> 4ed6fbe43414 8 seconds ago 4.41 MB
<none> <none> 6b0df8e71508 8 seconds ago 4.41 MB
docker.io/library/alpine latest 3fd9065eaf02 5 months ago 4.41 MB
```

## SEE ALSO
Expand Down

0 comments on commit 7965716

Please sign in to comment.