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

Merge pull request #4537 from thaJeztah/24.0_backort_docs_fixes 

[24.0 backport] docs/reference: run.md: remove stray whitespace and update cli-docs-tool to v0.6.0
This commit is contained in:
Sebastiaan van Stijn 2023-08-29 11:44:13 +02:00 committed by GitHub
parent b74d8e1a53 8e0393932b
commit 2fcff17544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/reference/commandline/system.md
View File

@ -5,13 +5,12 @@ Manage Docker
### Subcommands ### Subcommands
| Name | Description | | Name | Description |
|:-------------------------------------|:---------------------------------------------------------------------------------| |:-----------------------------|:-------------------------------------|
| [`df`](system_df.md) | Show docker disk usage | | [`df`](system_df.md) | Show docker disk usage |
| [`dial-stdio`](system_dial-stdio.md) | Proxy the stdio stream to the daemon connection. Should not be invoked manually. | | [`events`](system_events.md) | Get real time events from the server |
| [`events`](system_events.md) | Get real time events from the server | | [`info`](system_info.md) | Display system-wide information |
| [`info`](system_info.md) | Display system-wide information | | [`prune`](system_prune.md) | Remove unused data |
| [`prune`](system_prune.md) | Remove unused data |

4
docs/reference/run.md
View File

@ -672,7 +672,7 @@ the container exits**, you can add the `--rm` flag:
> ```console > ```console
> $ docker run --rm -v /foo -v awesome:/bar busybox top > $ docker run --rm -v /foo -v awesome:/bar busybox top
> ``` > ```
> >
> the volume for `/foo` will be removed, but the volume for `/bar` will not. > the volume for `/foo` will be removed, but the volume for `/bar` will not.
> Volumes inherited via `--volumes-from` will be removed with the same logic: if > Volumes inherited via `--volumes-from` will be removed with the same logic: if
> the original volume was specified with a name it will **not** be removed. > the original volume was specified with a name it will **not** be removed.
@ -1418,7 +1418,7 @@ container's logging driver. The following options are supported:
| `fluentd` | Fluentd logging driver for Docker. Writes log messages to `fluentd` (forward input). | | `fluentd` | Fluentd logging driver for Docker. Writes log messages to `fluentd` (forward input). |
| `awslogs` | Amazon CloudWatch Logs logging driver for Docker. Writes log messages to Amazon CloudWatch Logs. | | `awslogs` | Amazon CloudWatch Logs logging driver for Docker. Writes log messages to Amazon CloudWatch Logs. |
| `splunk` | Splunk logging driver for Docker. Writes log messages to `splunk` using Event Http Collector. | | `splunk` | Splunk logging driver for Docker. Writes log messages to `splunk` using Event Http Collector. |
| `etwlogs` | Event Tracing for Windows (ETW) events. Writes log messages as Event Tracing for Windows (ETW) events. Only Windows platforms. | | `etwlogs` | Event Tracing for Windows (ETW) events. Writes log messages as Event Tracing for Windows (ETW) events. Only Windows platforms. |
| `gcplogs` | Google Cloud Platform (GCP) Logging. Writes log messages to Google Cloud Platform (GCP) Logging. | | `gcplogs` | Google Cloud Platform (GCP) Logging. Writes log messages to Google Cloud Platform (GCP) Logging. |
| `logentries` | Rapid7 Logentries. Writes log messages to Rapid7 Logentries. | | `logentries` | Rapid7 Logentries. Writes log messages to Rapid7 Logentries. |

2
scripts/docs/generate-md.sh
View File

@ -2,7 +2,7 @@
set -eu set -eu
: "${CLI_DOCS_TOOL_VERSION=v0.5.1}" : "${CLI_DOCS_TOOL_VERSION=v0.6.0}"
export GO111MODULE=auto export GO111MODULE=auto