diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-29 20:46:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 20:46:09 +0200 |
| commit | 8422503f4311555ecb799449b371ad1600a8020f (patch) | |
| tree | 505e5b49df34b0e42d6ca49b9651e0c4ef4ba363 | |
| parent | 8a8db34131c213c3880940284c2fa278ae48cd7d (diff) | |
| parent | 635c161f38aa68c40d98b108f6a3b12f0e36a58a (diff) | |
| download | podman-8422503f4311555ecb799449b371ad1600a8020f.tar.gz podman-8422503f4311555ecb799449b371ad1600a8020f.tar.bz2 podman-8422503f4311555ecb799449b371ad1600a8020f.zip | |
Merge pull request #3221 from josegonzalez/master
Add missing 'container cp' alias and document missing 'container update' command
| -rw-r--r-- | cmd/podman/container.go | 1 | ||||
| -rw-r--r-- | completions/bash/podman | 5 | ||||
| -rw-r--r-- | docs/podman-container.1.md | 1 | ||||
| -rw-r--r-- | transfer.md | 3 |
4 files changed, 9 insertions, 1 deletions
diff --git a/cmd/podman/container.go b/cmd/podman/container.go index 530175a55..839ae3a0e 100644 --- a/cmd/podman/container.go +++ b/cmd/podman/container.go @@ -54,6 +54,7 @@ var ( _checkpointCommand, _containerExistsCommand, _contInspectSubCommand, + _cpCommand, _diffCommand, _exportCommand, _createCommand, diff --git a/completions/bash/podman b/completions/bash/podman index 5b23e12dc..98038d19c 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -769,6 +769,10 @@ _podman_container_commit() { _podman_commit } +_podman_container_cp() { + _podman_cp +} + _podman_container_create() { _podman_create } @@ -966,6 +970,7 @@ _podman_container() { attach checkpoint commit + cp create diff exec diff --git a/docs/podman-container.1.md b/docs/podman-container.1.md index 564d791fa..eb53149bd 100644 --- a/docs/podman-container.1.md +++ b/docs/podman-container.1.md @@ -17,6 +17,7 @@ The container command allows you to manage containers | checkpoint | [podman-container-checkpoint(1)](podman-container-checkpoint.1.md) | Checkpoints one or more containers. | | cleanup | [podman-container-cleanup(1)](podman-container-cleanup.1.md) | Cleanup containers network and mountpoints. | | commit | [podman-commit(1)](podman-commit.1.md) | Create new image based on the changed container. | +| cp | [podman-cp(1)](podman-cp.1.md) | Copy files/folders between a container and the local filesystem. | | create | [podman-create(1)](podman-create.1.md) | Create a new container. | | diff | [podman-diff(1)](podman-diff.1.md) | Inspect changes on a container or image's filesystem. | | exec | [podman-exec(1)](podman-exec.1.md) | Execute a command in a running container. | diff --git a/transfer.md b/transfer.md index 79b6d3461..7cfd5a85d 100644 --- a/transfer.md +++ b/transfer.md @@ -91,10 +91,11 @@ Those Docker commands currently do not have equivalents in `podman`: | Missing command | Description| | :--- | :--- | +| `docker container update` | podman does not support altering running containers. We recommend recreating containers with the correct arguments.| +| `docker container rename` | podman does not support `container rename` - or the `rename` shorthand. We recommend using `podman rm` and `podman create` to create a container with a specific name.| | `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 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` || |