From 3e8e1d924edb198f12411431cf2ecff18155582b Mon Sep 17 00:00:00 2001 From: Qiutong Song Date: Tue, 8 Dec 2020 20:44:51 +0000 Subject: [PATCH] Address comments Signed-off-by: Qiutong Song --- .../blog/_posts/2020-12-02-dockershim-faq.md | 2 +- .../tasks/debug-application-cluster/crictl.md | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/content/en/blog/_posts/2020-12-02-dockershim-faq.md b/content/en/blog/_posts/2020-12-02-dockershim-faq.md index eddadddb78..687921a7ce 100644 --- a/content/en/blog/_posts/2020-12-02-dockershim-faq.md +++ b/content/en/blog/_posts/2020-12-02-dockershim-faq.md @@ -140,7 +140,7 @@ runtime where possible. Another thing to look out for is anything expecting to run for system maintenance or nested inside a container when building images will no longer work. For the -former, you can use the [`crictl`][cr] tool as a drop-in replacement and for the +former, you can use the [`crictl`][cr] tool as a drop-in replacement (see [mapping from docker cli to crictl](https://kubernetes.io/docs/tasks/debug-application-cluster/crictl/#mapping-from-docker-cli-to-crictl)) and for the latter you can use newer container build options like [img], [buildah], or [kaniko] that don’t require Docker. diff --git a/content/en/docs/tasks/debug-application-cluster/crictl.md b/content/en/docs/tasks/debug-application-cluster/crictl.md index e61ee50b60..5a73a88aad 100644 --- a/content/en/docs/tasks/debug-application-cluster/crictl.md +++ b/content/en/docs/tasks/debug-application-cluster/crictl.md @@ -364,35 +364,39 @@ Warn: the output format of CRICTL is similar to Docker CLI, despite some missing ### Retrieve Debugging Information - +{{< table caption="mapping from docker cli to crictl - retrieve debugging information" >}} docker cli | crictl | Description | Unsupported Features -- | -- | -- | -- -attach | attach | Attach to a running container | --detach-keys, --sig-proxy -exec | exec | Run a command in a running container | --privileged, --user, --detach-keys +attach | attach | Attach to a running container | `--detach-keys`, `--sig-proxy` +exec | exec | Run a command in a running container | `--privileged`, `--user`, `--detach-keys` images | images | List images |   info | info | Display system-wide information |   inspect | inspectinspecti | Return low-level information on a container, image or task |   -logs | logs | Fetch the logs of a container | --details +logs | logs | Fetch the logs of a container | `--details` ps | ps | List containers |   stats | stats | Display a live stream of container(s) resource usage statistics | Column: NET/BLOCK I/O, PIDs version | version | Show the runtime (Docker, ContainerD, or others) version information |   +{{< /table >}} ### Perform Changes +{{< table caption="mapping from docker cli to crictl - perform changes" >}} docker cli | crictl | Description | Unsupported Features -- | -- | -- | -- create | create | Create a new container |   -kill | stop (timeout = 0) | Kill one or more running container | --signal -pull | pull | Pull an image or a repository from a registry | --all-tags, --disable-content-trust +kill | stop (timeout = 0) | Kill one or more running container | `--signal` +pull | pull | Pull an image or a repository from a registry | `--all-tags`, `--disable-content-trust` rm | rm | Remove one or more containers |   rmi | rmi | Remove one or more images |   run | run | Run a command in a new container |   -start | start | Start one or more stopped containers | --detach-keys +start | start | Start one or more stopped containers | `--detach-keys` stop | stop | Stop one or more running containers |   -update | update | Update configuration of one or more containers | --restart, --blkio-weight and some other resource limit not supported by CRI. +update | update | Update configuration of one or more containers | `--restart`, `--blkio-weight` and some other resource limit not supported by CRI. +{{< /table >}} ### Supported only in crictl +{{< table caption="mapping from docker cli to crictl - supported only in crictl" >}} crictl | Description -- | -- imagefsinfo | Return image filesystem info @@ -402,3 +406,4 @@ pods | List pods runp | Run a new pod rmp | Remove one or more pods stopp | Stop one or more running pods +{{< /table >}} \ No newline at end of file