Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3079 from thaJeztah/20.10_backport_update_docker_stop 

[20.10 backport] docs updates
This commit is contained in:
Silvin Lubecki 2021-05-04 15:44:44 +02:00 committed by GitHub
parent bb03b9d3c2 4fbdf3f362
commit 9780f41efe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/commandline/dockerd.md
View File

@ -1400,6 +1400,10 @@ This is a full example of the allowed configuration options on Linux:
"log-driver": "json-file", "log-driver": "json-file",
"log-level": "", "log-level": "",
"log-opts": { "log-opts": {
"cache-disabled": "false",
"cache-max-file": "5",
"cache-max-size": "20m",
"cache-compress": "true",
"env": "os,customer", "env": "os,customer",
"labels": "somelabel", "labels": "somelabel",
"max-file": "5", "max-file": "5",

4
docs/reference/commandline/stop.md
View File

@ -19,7 +19,9 @@ Options:
## Description ## Description
The main process inside the container will receive `SIGTERM`, and after a grace The main process inside the container will receive `SIGTERM`, and after a grace
period, `SIGKILL`. period, `SIGKILL`. The first signal can be changed with the `STOPSIGNAL`
instruction in the container's Dockerfile, or the `--stop-signal` option to
`docker run`.
## Examples ## Examples