Skip to content

Commit 3e8e1d9

Browse files
committed
Address comments
Signed-off-by: Qiutong Song <[email protected]>
1 parent cb55041 commit 3e8e1d9

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

content/en/blog/_posts/2020-12-02-dockershim-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ runtime where possible.
140140

141141
Another thing to look out for is anything expecting to run for system maintenance
142142
or nested inside a container when building images will no longer work. For the
143-
former, you can use the [`crictl`][cr] tool as a drop-in replacement and for the
143+
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
144144
latter you can use newer container build options like [img], [buildah], or
145145
[kaniko] that don’t require Docker.
146146

content/en/docs/tasks/debug-application-cluster/crictl.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -364,35 +364,39 @@ Warn: the output format of CRICTL is similar to Docker CLI, despite some missing
364364

365365
### Retrieve Debugging Information
366366

367-
367+
{{< table caption="mapping from docker cli to crictl - retrieve debugging information" >}}
368368
docker cli | crictl | Description | Unsupported Features
369369
-- | -- | -- | --
370-
attach | attach | Attach to a running container | --detach-keys, --sig-proxy
371-
exec | exec | Run a command in a running container | --privileged, --user, --detach-keys
370+
attach | attach | Attach to a running container | `--detach-keys`, `--sig-proxy`
371+
exec | exec | Run a command in a running container | `--privileged`, `--user`, `--detach-keys`
372372
images | images | List images |  
373373
info | info | Display system-wide information |  
374374
inspect | inspectinspecti | Return low-level information on a container, image or task |  
375-
logs | logs | Fetch the logs of a container | --details
375+
logs | logs | Fetch the logs of a container | `--details`
376376
ps | ps | List containers |  
377377
stats | stats | Display a live stream of container(s) resource usage statistics | Column: NET/BLOCK I/O, PIDs
378378
version | version | Show the runtime (Docker, ContainerD, or others) version information |  
379+
{{< /table >}}
379380

380381
### Perform Changes
381382

383+
{{< table caption="mapping from docker cli to crictl - perform changes" >}}
382384
docker cli | crictl | Description | Unsupported Features
383385
-- | -- | -- | --
384386
create | create | Create a new container |  
385-
kill | stop (timeout = 0) | Kill one or more running container | --signal
386-
pull | pull | Pull an image or a repository from a registry | --all-tags, --disable-content-trust
387+
kill | stop (timeout = 0) | Kill one or more running container | `--signal`
388+
pull | pull | Pull an image or a repository from a registry | `--all-tags`, `--disable-content-trust`
387389
rm | rm | Remove one or more containers |  
388390
rmi | rmi | Remove one or more images |  
389391
run | run | Run a command in a new container |  
390-
start | start | Start one or more stopped containers | --detach-keys
392+
start | start | Start one or more stopped containers | `--detach-keys`
391393
stop | stop | Stop one or more running containers |  
392-
update | update | Update configuration of one or more containers | --restart, --blkio-weight and some other resource limit not supported by CRI.
394+
update | update | Update configuration of one or more containers | `--restart`, `--blkio-weight` and some other resource limit not supported by CRI.
395+
{{< /table >}}
393396

394397
### Supported only in crictl
395398

399+
{{< table caption="mapping from docker cli to crictl - supported only in crictl" >}}
396400
crictl | Description
397401
-- | --
398402
imagefsinfo | Return image filesystem info
@@ -402,3 +406,4 @@ pods | List pods
402406
runp | Run a new pod
403407
rmp | Remove one or more pods
404408
stopp | Stop one or more running pods
409+
{{< /table >}}

0 commit comments

Comments
 (0)