diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-22 20:04:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 20:04:16 -0400 |
| commit | c166b21602e9aa2ae9cfe76ca6f0289cc63e452f (patch) | |
| tree | c795fb451b06d1b239fbd77428f9778b3fdc6d38 | |
| parent | 9302ac3543bd8866dd77778aabc6647284586c9b (diff) | |
| parent | b9425467ed41e6febe9a7f4e02309634bd05d0ee (diff) | |
| download | podman-c166b21602e9aa2ae9cfe76ca6f0289cc63e452f.tar.gz podman-c166b21602e9aa2ae9cfe76ca6f0289cc63e452f.tar.bz2 podman-c166b21602e9aa2ae9cfe76ca6f0289cc63e452f.zip | |
Merge pull request #6357 from rhatdan/build6
Follow up PR to fix issues found in #6341
| -rw-r--r-- | commands-demo.md | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/system_varlink.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/commands-demo.md b/commands-demo.md index a32fdbcad..555f83af9 100644 --- a/commands-demo.md +++ b/commands-demo.md @@ -28,8 +28,10 @@ | [podman-history(1)](https://podman.readthedocs.io/en/latest/markdown/podman-history.1.html) | Shows the history of an image | | [podman-image(1)](https://podman.readthedocs.io/en/latest/image.html) | Manage Images | | [podman-image-exists(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-exists.1.html) | Check if an image exists in local storage | +| [podman-image-diff(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-diff.html) | Inspect changes on an image's filesystem. | | [podman-image-prune(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-prune.1.html) | Remove all unused images from the local store | | [podman-image-sign(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-sign.1.html) | Create a signature for an image | +| [podman-image-search(1)](https://podman.readthedocs.io/en/latest/markdown/podman-search.1.html) | Search a registry for an image. | | [podman-image-tree(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-tree.1.html) | Prints layer hierarchy of an image in a tree format | | [podman-image-trust(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-trust.1.html) | Manage container registry image trust policy | | [podman-images(1)](https://podman.readthedocs.io/en/latest/markdown/podman-images.1.html) | List images in local storage | [](https://podman.io/asciinema/podman/images/) | [Here](https://github.com/containers/Demos/blob/master/podman_cli/podman_images.sh) | diff --git a/pkg/domain/infra/abi/system_varlink.go b/pkg/domain/infra/abi/system_varlink.go index c0144babe..4dc766f52 100644 --- a/pkg/domain/infra/abi/system_varlink.go +++ b/pkg/domain/infra/abi/system_varlink.go @@ -39,7 +39,7 @@ func (ic *ContainerEngine) VarlinkService(_ context.Context, opts entities.Servi if err = service.Listen(opts.URI, opts.Timeout); err != nil { switch err.(type) { case varlink.ServiceTimeoutError: - logrus.Infof("varlink service expired (use --timeout to increase session time beyond %s ms, 0 means never timeout)", opts.Timeout.String()) + logrus.Infof("varlink service expired (use --time to increase session time beyond %s ms, 0 means never timeout)", opts.Timeout.String()) return nil default: return errors.Wrapf(err, "unable to start varlink service") |