diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-22 03:29:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-22 03:29:40 +0100 |
commit | b56a52ee5a6de641f8d30b732410027510958526 (patch) | |
tree | 746bf5038e3b905d583407aee9c715465b17c65a | |
parent | ed5ac815c20c29ef6724dd07e4be12c8c188beea (diff) | |
parent | 69f8b8bd7efc75b39e9b7e5ff0bc3ae14bfdc026 (diff) | |
download | podman-b56a52ee5a6de641f8d30b732410027510958526.tar.gz podman-b56a52ee5a6de641f8d30b732410027510958526.tar.bz2 podman-b56a52ee5a6de641f8d30b732410027510958526.zip |
Merge pull request #2190 from rhatdan/transfer
Update transfer.md and commands.md to add missing commands.
-rw-r--r-- | commands.md | 13 | ||||
-rw-r--r-- | docs/podman-image-trust.1.md | 2 | ||||
-rw-r--r-- | transfer.md | 41 |
3 files changed, 49 insertions, 7 deletions
diff --git a/commands.md b/commands.md index 43796722f..00be4f1bd 100644 --- a/commands.md +++ b/commands.md @@ -8,9 +8,14 @@ | [podman-attach(1)](/docs/podman-attach.1.md) | Attach to a running container |[![...](/docs/play.png)](https://asciinema.org/a/XDlocUrHVETFECg4zlO9nBbLf)| | [podman-build(1)](/docs/podman-build.1.md) | Build an image using instructions from Dockerfiles || | [podman-commit(1)](/docs/podman-commit.1.md) | Create new image based on the changed container || -| [podman-container(1)](/docs/podman-container.1.md) | Manage Containers || +| [podman-container(1)](/docs/podman-container.1.md) | Manage Containers || +| [podman-container-checkpoint(1)](/docs/podman-container-checkpoint.1.md) | Checkpoints one or more running containers || | [podman-container-cleanup(1)](/docs/podman-container-cleanup.1.md) | Cleanup Container storage and networks || +| [podman-container-exists(1)](/docs/podman-container-exists.1.md) | Check if an container exists in local storage || +| [podman-container-prune(1)](/docs/podman-container-prune.1.md) | Remove all stopped containers || | [podman-container-refresh(1)](/docs/podman-container-refresh.1.md) | Refresh all containers state in database || +| [podman-container-restore(1)](/docs/podman-container-restore.1.md) | Restores one or more running containers || +| [podman-container-runlabel(1)](/docs/podman-container-runlabel.1.md) | Execute Image Label Method || | [podman-cp(1)](/docs/podman-cp.1.md) | Instead of providing a `podman cp` command, the man page `podman-cp` describes how to use the `podman mount` command to have even more flexibility and functionality|| | [podman-create(1)](/docs/podman-create.1.md) | Create a new container || | [podman-diff(1)](/docs/podman-diff.1.md) | Inspect changes on a container or image's filesystem |[![...](/docs/play.png)](https://asciinema.org/a/FXfWB9CKYFwYM4EfqW3NSZy1G)| @@ -18,7 +23,11 @@ | [podman-export(1)](/docs/podman-export.1.md) | Export container's filesystem contents as a tar archive |[![...](/docs/play.png)](https://asciinema.org/a/913lBIRAg5hK8asyIhhkQVLtV)| | [podman-generate(1)](/docs/podman-generate.1.md) | Generate structured output based on Podman containers and pods | | | [podman-history(1)](/docs/podman-history.1.md) | Shows the history of an image |[![...](/docs/play.png)](https://asciinema.org/a/bCvUQJ6DkxInMELZdc5DinNSx)| -| [podman-image(1)](/docs/podman-image.1.md) | Manage Images|| +| [podman-image(1)](/docs/podman-image.1.md) | Manage Images|| +| [podman-image-exists(1)](/docs/podman-image-exists.1.md) | Check if an image exists in local storage|| +| [podman-image-prune(1)](/docs/podman-image-prune.1.md) | Remove all unused images|| +| [podman-image-sign(1)](/docs/podman-image-sign.1.md) | Create a signature for an image|| +| [podman-image-trust(1)](/docs/podman-image-trust.1.md) | Manage container registry image trust policy|| | [podman-images(1)](/docs/podman-images.1.md) | List images in local storage |[![...](/docs/play.png)](https://asciinema.org/a/133649)| | [podman-import(1)](/docs/podman-import.1.md) | Import a tarball and save it as a filesystem image || | [podman-info(1)](/docs/podman-info.1.md) | Display system information |[![...](/docs/play.png)](https://asciinema.org/a/yKbi5fQ89y5TJ8e1RfJd4ivTD)| diff --git a/docs/podman-image-trust.1.md b/docs/podman-image-trust.1.md index 24209698c..3b6564315 100644 --- a/docs/podman-image-trust.1.md +++ b/docs/podman-image-trust.1.md @@ -1,7 +1,7 @@ % podman-image-trust "1" # NAME -podman\-trust - Manage container image trust policy +podman\-trust - Manage container registry image trust policy # SYNOPSIS diff --git a/transfer.md b/transfer.md index 00e732265..c0d309575 100644 --- a/transfer.md +++ b/transfer.md @@ -40,7 +40,7 @@ There are other equivalents for these tools | `docker attach` | [`podman exec`](./docs/podman-attach.1.md) | | `docker build` | [`podman build`](./docs/podman-build.1.md) | | `docker commit` | [`podman commit`](./docs/podman-commit.1.md) | -| `docker container`|[`podman container`](./docs/podman-container.1.md) | +| `docker container`|[`podman container`](./docs/podman-container.1.md) | | `docker cp` | [`podman mount`](./docs/podman-cp.1.md) **** | | `docker create` | [`podman create`](./docs/podman-create.1.md) | | `docker diff` | [`podman diff`](./docs/podman-diff.1.md) | @@ -70,7 +70,13 @@ There are other equivalents for these tools | `docker top` | [`podman top`](./docs/podman-top.1.md) | | `docker unpause` | [`podman unpause`](./docs/podman-unpause.1.md) | | `docker version` | [`podman version`](./docs/podman-version.1.md) | -| `docker wait` | [`podman wait`](./docs/podman-wait.1.md) | +| `docker volume` | [`podman volume`](./docs/podman-volume.1.md) | +| `docker volume create` | [`podman volume create`](./docs/podman-volume-create.1.md) | +| `docker volume inspect`| [`podman volume inspect`](./docs/podman-volume-inspect.1.md)| +| `docker volume ls` | [`podman volume ls`](./docs/podman-volume-ls.1.md) | +| `docker volume prune` | [`podman volume prune`](./docs/podman-volume-prune.1.md) | +| `docker volume rm` | [`podman volume rm`](./docs/podman-volume-rm.1.md) | +| `docker wait` | [`podman wait`](./docs/podman-wait.1.md) | **** Use mount to take advantage of the entire linux tool chain rather then just cp. Read [`here`](./docs/podman-cp.1.md) for more information. @@ -83,18 +89,45 @@ Those Docker commands currently do not have equivalents in `podman`: | `docker events` || | `docker network` || | `docker node` || -| `docker plugin` |podman does not support plugins. We recommend you use alternative OCI Runtimes or OCI Runtime Hooks to alter behavior of podman.| +| `docker plugin` | podman does not support plugins. We recommend you use alternative OCI Runtimes or OCI Runtime Hooks to alter behavior of podman.| | `docker rename` | podman does not support rename, you need to use `podman rm` and `podman create` to rename a container.| | `docker secret` || | `docker service` || | `docker stack` || | `docker swarm` | podman does not support swarm. We support Kubernetes for orchestration using [CRI-O](https://github.com/kubernetes-sigs/cri-o).| | `docker system` || -| `docker volume` | podman does not support volumes. Volumes should be built on the host operating system and then volume mounted into the containers.| +| `docker volume` | podman currently supports file volumes. Future enhancement planned to support Docker Volumes Plugins ## Missing commands in Docker The following podman commands do not have a Docker equivalent: +* [`podman generate`](./docs/podman-generate.1.md) +* [`podman generate kube`](./docs/podman-generate-kube.1.md) +* [`podman container checkpoint`](/docs/podman-container-checkpoint.1.md) +* [`podman container cleanup`](/docs/podman-container-cleanup.1.md) +* [`podman container exists`](/docs/podman-container-exists.1.md) +* [`podman container refresh`](/docs/podman-container-refresh.1.md) +* [`podman container runlabel`](/docs/podman-container-runlabel.1.md) +* [`podman container restore`](/docs/podman-container-restore.1.md) +* [`podman image exists`](./docs/podman-image-exists.1.md) +* [`podman image sign`](./docs/podman-image-sign.1.md) +* [`podman image trust`](./docs/podman-image-trust.1.md) * [`podman mount`](./docs/podman-mount.1.md) +* [`podman play`](./docs/podman-play.1.md) +* [`podman play kube`](./docs/podman-play-kube.1.md) +* [`podman pod`](./docs/podman-pod.1.md) +* [`podman pod create`](./docs/podman-pod-create.1.md) +* [`podman pod exists`](./docs/podman-pod-exists.1.md) +* [`podman pod inspect`](./docs/podman-pod-inspect.1.md) +* [`podman pod kill`](./docs/podman-pod-kill.1.md) +* [`podman pod pause`](./docs/podman-pod-pause.1.md) +* [`podman pod ps`](./docs/podman-pod-ps.1.md) +* [`podman pod restart`](./docs/podman-pod-restart.1.md) +* [`podman pod rm`](./docs/podman-pod-rm.1.md) +* [`podman pod start`](./docs/podman-pod-start.1.md) +* [`podman pod stop`](./docs/podman-pod-stop.1.md) +* [`podman pod top`](./docs/podman-pod-top.1.md) +* [`podman pod unpause`](./docs/podman-pod-unpause.1.md) +* [`podman varlink`](./docs/podman-varlink.1.md) * [`podman umount`](./docs/podman-umount.1.md) |