Skip to content

Commit a2f9383

Browse files
authored
Merge pull request moby#4590 from dvdksn/docs-fixups
docs: tiny improvements
2 parents 36cc4d9 + 2471c5b commit a2f9383

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

docs/buildkitd.toml.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ of daemon configuration.
77
The file path is `/etc/buildkit/buildkitd.toml` for rootful mode,
88
`~/.config/buildkit/buildkitd.toml` for rootless mode.
99

10-
The following is a complete `buildkitd.toml` configuration example, please
11-
note some configuration is only good for edge cases, please take care of it
12-
carefully.
10+
The following is a complete `buildkitd.toml` configuration example.
11+
Note that some configuration options are only useful in edge cases.
1312

1413
```toml
1514
# debug enables additional debug logging

frontend/dockerfile/docs/reference.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,13 +1260,10 @@ doesn't support authentication.
12601260
`ADD` obeys the following rules:
12611261

12621262
- The `<src>` path must be inside the build context;
1263-
you can't use `COPY ../something /something`, because the builder can only
1263+
you can't use `ADD ../something /something`, because the builder can only
12641264
access files from the context, and `../something` specifies a parent file or
12651265
directory of the build context root.
12661266

1267-
- If `<src>` is a directory, the entire contents of the directory are copied,
1268-
including filesystem metadata.
1269-
12701267
- If `<src>` is a URL and `<dest>` does end with a trailing slash, then the
12711268
filename is inferred from the URL and the file is downloaded to
12721269
`<dest>/<filename>`. For instance, `ADD http://example.com/foobar /` would
@@ -1308,8 +1305,8 @@ doesn't support authentication.
13081305
use of a wildcard, then `<dest>` must be a directory, and it must end with
13091306
a slash `/`.
13101307

1311-
- If `<dest>` doesn't end with a trailing slash, it will be considered a
1312-
regular file and the contents of `<src>` will be written at `<dest>`.
1308+
- If `<src>` is a file, and `<dest>` doesn't end with a trailing slash,
1309+
the contents of `<src>` will be written as filename `<dest>`.
13131310

13141311
- If `<dest>` doesn't exist, it's created, along with all missing directories
13151312
in its path.
@@ -1487,8 +1484,8 @@ attempted to be used instead.
14871484
use of a wildcard, then `<dest>` must be a directory, and it must end with
14881485
a slash `/`.
14891486

1490-
- If `<dest>` doesn't end with a trailing slash, it will be considered a
1491-
regular file and the contents of `<src>` will be written at `<dest>`.
1487+
- If `<src>` is a file, and `<dest>` doesn't end with a trailing slash,
1488+
the contents of `<src>` will be written as filename `<dest>`.
14921489

14931490
- If `<dest>` doesn't exist, it's created, along with all missing directories
14941491
in its path.

0 commit comments

Comments
 (0)