Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit a1c631a

Browse files
committed
Fix whitespace that caused short-format in generated YAML
If the markdown contains trailing spaces, or has tabs included, the YAML generator uses a compact format for the text (using `\n` and `\t`, instead of plain newlines). The compact format makes it difficult to review changes in the yaml docs when vendoring in the documentation repository. This patch: - removes trailing whitespace - replaces tabs for spaces - fixes some minor formatting and markdown issues Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit f912deeec7fcabfba2d6c833854275231bf746cd) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 9fd323afdcec35e57272a4bafb882f71a2b39e0f Component: cli
1 parent ee8847c commit a1c631a

23 files changed

Lines changed: 260 additions & 227 deletions

components/cli/docs/reference/commandline/build.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Options:
4949
--no-cache Do not use cache when building the image
5050
-o, --output Output destination (format: type=local,dest=path)
5151
--pull Always attempt to pull a newer version of the image
52-
--progress Set type of progress output (only if BuildKit enabled) (auto, plain, tty).
52+
--progress Set type of progress output (only if BuildKit enabled) (auto, plain, tty).
5353
Use plain to show container output
5454
-q, --quiet Suppress the build output and print image ID on success
5555
--rm Remove intermediate containers after a successful build (default true)
@@ -431,7 +431,7 @@ $ docker build --build-arg HTTP_PROXY=http://10.20.30.2:1234 --build-arg FTP_PRO
431431
This flag allows you to pass the build-time variables that are
432432
accessed like regular environment variables in the `RUN` instruction of the
433433
Dockerfile. Also, these values don't persist in the intermediate or final images
434-
like `ENV` values do. You must add `--build-arg` for each build argument.
434+
like `ENV` values do. You must add `--build-arg` for each build argument.
435435

436436
Using this flag will not alter the output you see when the `ARG` lines from the
437437
Dockerfile are echoed during the build process.
@@ -533,7 +533,7 @@ path):
533533
$ docker build --output type=local,dest=out .
534534
```
535535

536-
Use the `tar` type to export the files as a `.tar` archive:
536+
Use the `tar` type to export the files as a `.tar` archive:
537537

538538
```bash
539539
$ docker build --output type=tar,dest=out.tar .

components/cli/docs/reference/commandline/dockerd.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ C:\> dockerd --storage-opt size=40G
821821

822822
##### `lcow.globalmode`
823823

824-
Specifies whether the daemon instantiates utility VM instances as required
824+
Specifies whether the daemon instantiates utility VM instances as required
825825
(recommended and default if omitted), or uses single global utility VM (better
826826
performance, but has security implications and not recommended for production
827827
deployments).
@@ -1071,7 +1071,7 @@ system's list of trusted CAs instead of enabling `--insecure-registry`.
10711071

10721072
#### Legacy Registries
10731073

1074-
Starting with Docker 17.12, operations against registries supporting only the
1074+
Starting with Docker 17.12, operations against registries supporting only the
10751075
legacy v1 protocol are no longer supported. Specifically, the daemon will not
10761076
attempt `push`, `pull` and `login` to v1 registries. The exception to this is
10771077
`search` which can still be performed on v1 registries.
@@ -1446,8 +1446,8 @@ This is a full example of the allowed configuration options on Windows:
14461446
```
14471447

14481448
#### Feature options
1449-
The optional field `features` in `daemon.json` allows users to enable or disable specific
1450-
daemon features. For example, `{"features":{"buildkit": true}}` enables `buildkit` as the
1449+
The optional field `features` in `daemon.json` allows users to enable or disable specific
1450+
daemon features. For example, `{"features":{"buildkit": true}}` enables `buildkit` as the
14511451
default docker image builder.
14521452

14531453
The list of currently supported feature options:

components/cli/docs/reference/commandline/events.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ Options:
3131
## Description
3232

3333
Use `docker events` to get real-time events from the server. These events differ
34-
per Docker object type. Different event types have different scopes. Local
35-
scoped events are only seen on the node they take place on, and swarm scoped
34+
per Docker object type. Different event types have different scopes. Local
35+
scoped events are only seen on the node they take place on, and swarm scoped
3636
events are seen on all managers.
3737

38-
Only the last 1000 log events are returned. You can use filters to further limit
38+
Only the last 1000 log events are returned. You can use filters to further limit
3939
the number of events returned.
4040

4141
### Object types
@@ -165,7 +165,7 @@ that have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap
165165
seconds (aka Unix epoch or Unix time), and the optional .nanoseconds field is a
166166
fraction of a second no more than nine digits long.
167167

168-
Only the last 1000 log events are returned. You can use filters to further limit
168+
Only the last 1000 log events are returned. You can use filters to further limit
169169
the number of events returned.
170170

171171
#### Filtering
@@ -207,7 +207,7 @@ format. Go's [text/template](http://golang.org/pkg/text/template/) package
207207
describes all the details of the format.
208208

209209
If a format is set to `{{json .}}`, the events are streamed as valid JSON
210-
Lines. For information about JSON Lines, please refer to http://jsonlines.org/ .
210+
Lines. For information about JSON Lines, please refer to http://jsonlines.org/.
211211

212212
## Examples
213213

@@ -410,12 +410,12 @@ Type=container Status=destroy ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299
410410

411411
#### Format as JSON
412412

413-
```none
414-
$ docker events --format '{{json .}}'
413+
```bash
414+
$ docker events --format '{{json .}}'
415415

416-
{"status":"create","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
417-
{"status":"attach","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
418-
{"Type":"network","Action":"connect","Actor":{"ID":"1b50a5bf755f6021dfa78e..
419-
{"status":"start","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f42..
420-
{"status":"resize","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
416+
{"status":"create","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
417+
{"status":"attach","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
418+
{"Type":"network","Action":"connect","Actor":{"ID":"1b50a5bf755f6021dfa78e..
419+
{"status":"start","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f42..
420+
{"status":"resize","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
421421
```

components/cli/docs/reference/commandline/exec.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Options:
2929
--privileged Give extended privileges to the command
3030
-t, --tty Allocate a pseudo-TTY
3131
-u, --user Username or UID (format: <name|uid>[:<group|gid>])
32-
-w, --workdir Working directory inside the container
32+
-w, --workdir Working directory inside the container
3333
```
3434

3535
## Description
@@ -83,8 +83,8 @@ Next, set an environment variable in the current bash session.
8383
$ docker exec -it -e VAR=1 ubuntu_bash bash
8484
```
8585

86-
This will create a new Bash session in the container `ubuntu_bash` with environment
87-
variable `$VAR` set to "1". Note that this environment variable will only be valid
86+
This will create a new Bash session in the container `ubuntu_bash` with environment
87+
variable `$VAR` set to "1". Note that this environment variable will only be valid
8888
on the current Bash session.
8989

9090
By default `docker exec` command runs in the same working directory set when container was created.

components/cli/docs/reference/commandline/info.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Server:
106106
myinsecurehost:5000
107107
127.0.0.0/8
108108
```
109-
109+
110110
### Show debugging output
111111

112112
Here is a sample output for a daemon running on Ubuntu, using the overlay2

components/cli/docs/reference/commandline/login.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ Options:
3232

3333
Login to a registry.
3434

35+
## Examples
36+
3537
### Login to a self-hosted registry
3638

3739
If you want to login to a self-hosted registry you can specify this by
@@ -94,7 +96,7 @@ For example, to use `docker-credential-osxkeychain`:
9496

9597
```json
9698
{
97-
"credsStore": "osxkeychain"
99+
"credsStore": "osxkeychain"
98100
}
99101
```
100102

@@ -124,9 +126,9 @@ or an identity token.
124126

125127
```json
126128
{
127-
"ServerURL": "https://index.docker.io/v1",
128-
"Username": "david",
129-
"Secret": "passw0rd1"
129+
"ServerURL": "https://index.docker.io/v1",
130+
"Username": "david",
131+
"Secret": "passw0rd1"
130132
}
131133
```
132134

@@ -145,8 +147,8 @@ and password from this payload:
145147

146148
```json
147149
{
148-
"Username": "david",
149-
"Secret": "passw0rd1"
150+
"Username": "david",
151+
"Secret": "passw0rd1"
150152
}
151153
```
152154

components/cli/docs/reference/commandline/manifest.md

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ more (ideally more than one) image names. It can then be used in the same way as
4343
an image name in `docker pull` and `docker run` commands, for example.
4444

4545
Ideally a manifest list is created from images that are identical in function for
46-
different os/arch combinations. For this reason, manifest lists are often referred to as
47-
"multi-arch images". However, a user could create a manifest list that points
46+
different os/arch combinations. For this reason, manifest lists are often referred
47+
to as "multi-arch images". However, a user could create a manifest list that points
4848
to two images -- one for windows on amd64, and one for darwin on amd64.
4949

5050
### manifest inspect
@@ -62,7 +62,7 @@ Options:
6262
-v, --verbose Output additional info including layers and platform
6363
```
6464

65-
### manifest create
65+
### manifest create
6666

6767
```bash
6868
Usage: docker manifest create MANIFEST_LIST MANIFEST [MANIFEST...]
@@ -76,6 +76,7 @@ Options:
7676
```
7777

7878
### manifest annotate
79+
7980
```bash
8081
Usage: docker manifest annotate [OPTIONS] MANIFEST_LIST MANIFEST
8182

@@ -91,6 +92,7 @@ Options:
9192
```
9293

9394
### manifest push
95+
9496
```bash
9597
Usage: docker manifest push [OPTIONS] MANIFEST_LIST
9698

@@ -104,12 +106,21 @@ Options:
104106

105107
### Working with insecure registries
106108

107-
The manifest command interacts solely with a Docker registry. Because of this, it has no way to query the engine for the list of allowed insecure registries. To allow the CLI to interact with an insecure registry, some `docker manifest` commands have an `--insecure` flag. For each transaction, such as a `create`, which queries a registry, the `--insecure` flag must be specified. This flag tells the CLI that this registry call may ignore security concerns like missing or self-signed certificates. Likewise, on a `manifest push` to an insecure registry, the `--insecure` flag must be specified. If this is not used with an insecure registry, the manifest command fails to find a registry that meets the default requirements.
109+
The manifest command interacts solely with a Docker registry. Because of this,
110+
it has no way to query the engine for the list of allowed insecure registries.
111+
To allow the CLI to interact with an insecure registry, some `docker manifest`
112+
commands have an `--insecure` flag. For each transaction, such as a `create`,
113+
which queries a registry, the `--insecure` flag must be specified. This flag
114+
tells the CLI that this registry call may ignore security concerns like missing
115+
or self-signed certificates. Likewise, on a `manifest push` to an insecure
116+
registry, the `--insecure` flag must be specified. If this is not used with an
117+
insecure registry, the manifest command fails to find a registry that meets the
118+
default requirements.
108119

109120
## Examples
110121

111122
### Inspect an image's manifest object
112-
123+
113124
```bash
114125
$ docker manifest inspect hello-world
115126
{
@@ -136,7 +147,7 @@ The `docker manifest inspect` command takes an optional `--verbose` flag
136147
that gives you the image's name (Ref), and architecture and os (Platform).
137148

138149
Just as with other docker commands that take image names, you can refer to an image with or
139-
without a tag, or by digest (e.g. hello-world@sha256:f3b3b28a45160805bb16542c9531888519430e9e6d6ffc09d72261b0d26ff74f).
150+
without a tag, or by digest (e.g. `hello-world@sha256:f3b3b28a45160805bb16542c9531888519430e9e6d6ffc09d72261b0d26ff74f`).
140151

141152
Here is an example of inspecting an image's manifest with the `--verbose` flag:
142153

@@ -170,24 +181,27 @@ $ docker manifest inspect --verbose hello-world
170181

171182
### Create and push a manifest list
172183

173-
To create a manifest list, you first `create` the manifest list locally by specifying the constituent images you would
174-
like to have included in your manifest list. Keep in mind that this is pushed to a registry, so if you want to push
175-
to a registry other than the docker registry, you need to create your manifest list with the registry name or IP and port.
184+
To create a manifest list, you first `create` the manifest list locally by
185+
specifying the constituent images you would like to have included in your
186+
manifest list. Keep in mind that this is pushed to a registry, so if you want to
187+
push to a registry other than the docker registry, you need to create your
188+
manifest list with the registry name or IP and port.
176189
This is similar to tagging an image and pushing it to a foreign registry.
177190

178191
After you have created your local copy of the manifest list, you may optionally
179-
`annotate` it. Annotations allowed are the architecture and operating system (overriding the image's current values),
180-
os features, and an architecture variant.
192+
`annotate` it. Annotations allowed are the architecture and operating system
193+
(overriding the image's current values), os features, and an architecture variant.
181194

182-
Finally, you need to `push` your manifest list to the desired registry. Below are descriptions of these three commands,
183-
and an example putting them all together.
195+
Finally, you need to `push` your manifest list to the desired registry. Below are
196+
descriptions of these three commands, and an example putting them all together.
184197

185198
```bash
186199
$ docker manifest create 45.55.81.106:5000/coolapp:v1 \
187200
45.55.81.106:5000/coolapp-ppc64le-linux:v1 \
188201
45.55.81.106:5000/coolapp-arm-linux:v1 \
189202
45.55.81.106:5000/coolapp-amd64-linux:v1 \
190203
45.55.81.106:5000/coolapp-amd64-windows:v1
204+
191205
Created manifest list 45.55.81.106:5000/coolapp:v1
192206
```
193207

@@ -255,20 +269,24 @@ $ docker manifest inspect coolapp:v1
255269

256270
### Push to an insecure registry
257271

258-
Here is an example of creating and pushing a manifest list using a known insecure registry.
272+
Here is an example of creating and pushing a manifest list using a known
273+
insecure registry.
259274

260-
```
275+
```bash
261276
$ docker manifest create --insecure myprivateregistry.mycompany.com/repo/image:1.0 \
262277
myprivateregistry.mycompany.com/repo/image-linux-ppc64le:1.0 \
263278
myprivateregistry.mycompany.com/repo/image-linux-s390x:1.0 \
264279
myprivateregistry.mycompany.com/repo/image-linux-arm:1.0 \
265280
myprivateregistry.mycompany.com/repo/image-linux-armhf:1.0 \
266281
myprivateregistry.mycompany.com/repo/image-windows-amd64:1.0 \
267282
myprivateregistry.mycompany.com/repo/image-linux-amd64:1.0
268-
```
269-
```
283+
270284
$ docker manifest push --insecure myprivateregistry.mycompany.com/repo/image:tag
271285
```
272286

273-
Note that the `--insecure` flag is not required to annotate a manifest list, since annotations are to a locally-stored copy of a manifest list. You may also skip the `--insecure` flag if you are performing a `docker manifest inspect` on a locally-stored manifest list. Be sure to keep in mind that locally-stored manifest lists are never used by the engine on a `docker pull`.
287+
> **Note**: the `--insecure` flag is not required to annotate a manifest list,
288+
> since annotations are to a locally-stored copy of a manifest list. You may also
289+
> skip the `--insecure` flag if you are performing a `docker manifest inspect`
290+
> on a locally-stored manifest list. Be sure to keep in mind that locally-stored
291+
> manifest lists are never used by the engine on a `docker pull`.
274292

components/cli/docs/reference/commandline/network_ls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ The following filter matches all user defined networks:
192192
```bash
193193
$ docker network ls --filter type=custom
194194
NETWORK ID NAME DRIVER SCOPE
195-
95e74588f40d foo bridge local
195+
95e74588f40d foo bridge local
196196
63d1ff1f77b0 dev bridge local
197197
```
198198

0 commit comments

Comments
 (0)