Skip to content

Commit 49f3d8f

Browse files
authored
Merge pull request moby#5261 from dvdksn/docs-alert-syntax
docs: use gh alert syntax for callouts
2 parents d581877 + 47e0e63 commit 49f3d8f

File tree

7 files changed

+23
-42
lines changed

7 files changed

+23
-42
lines changed

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,12 @@ Introductory blog post https://blog.mobyproject.org/introducing-buildkit-17e056c
3030

3131
Join `#buildkit` channel on [Docker Community Slack](https://dockr.ly/comm-slack)
3232

33-
> **Note**
34-
>
33+
> [!NOTE]
3534
> If you are visiting this repo for the usage of BuildKit-only Dockerfile features
3635
> like `RUN --mount=type=(bind|cache|tmpfs|secret|ssh)`, please refer to the
3736
> [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
3837
39-
> **Note**
40-
>
38+
> [!NOTE]
4139
> `docker build` [uses Buildx and BuildKit by default](https://docs.docker.com/build/architecture/) since Docker Engine 23.0.
4240
> You don't need to read this document unless you want to use the full-featured
4341
> standalone version of BuildKit.
@@ -614,8 +612,7 @@ There are 2 options supported for Azure Blob Storage authentication:
614612
* Any system using environment variables supported by the [Azure SDK for Go](https://docs.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication). The configuration must be available for the buildkit daemon, not for the client.
615613
* Secret Access Key, using the `secret_access_key` attribute to specify the primary or secondary account key for your Azure Blob Storage account. [Azure Blob Storage account keys](https://docs.microsoft.com/en-us/azure/storage/common/storage-account-keys-manage)
616614

617-
> **Note**
618-
>
615+
> [!NOTE]
619616
> Account name can also be specified with `account_name` attribute (or `$BUILDKIT_AZURE_STORAGE_ACCOUNT_NAME`)
620617
> if it is not part of the account URL host.
621618

docs/attestations/sbom-protocol.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ mount, writes its SBOM scan data to a specified directory.
1010
The SBOM generator image is expected to follow the rules of the BuildKit SBOM
1111
generator protocol, defined in this document.
1212

13-
> **Note**
14-
>
13+
> [!NOTE]
1514
> Currently, only SBOMs in the [SPDX](https://spdx.dev) JSON format are
1615
> supported.
1716
>

docs/dev/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
These are the BuildKit developer docs, designed to be read by technical users
44
interested in contributing to or integrating with BuildKit.
55

6-
> **Warning**
7-
>
6+
> [!WARNING]
87
> While these docs attempt to keep up with the current state of our `master`
98
> development branch, the code is constantly changing and updating, as bugs are
109
> fixed, and features are added. Remember, the ultimate source of truth is

docs/dev/solver.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ for its inputs.
151151
after it has completed. In LLB this is used for calculating a cache key based
152152
on the checksum of file contents of the input snapshots.
153153

154-
> **Note**
155-
>
154+
> [!NOTE]
156155
> For example, in the case of LLB, if a vertex is a FileOp that copies a file
157156
> from one snapshot to another, the selector can be set to the path of the
158157
> source file in the input snapshot, while the content-based cache function can

frontend/dockerfile/docs/reference.md

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ world
8080

8181
Comments don't support line continuation characters.
8282

83+
> [!NOTE]
8384
> **Note on whitespace**
8485
>
8586
> For backward compatibility, leading whitespace before comments (`#`) and
@@ -857,8 +858,7 @@ can be controlled by an earlier build stage.
857858
The command is run in the host's network environment (similar to
858859
`docker build --network=host`, but on a per-instruction basis)
859860

860-
> **Warning**
861-
>
861+
> [!WARNING]
862862
> The use of `--network=host` is protected by the `network.host` entitlement,
863863
> which needs to be enabled when starting the buildkitd daemon with
864864
> `--allow-insecure-entitlement network.host` flag or in [buildkitd config](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md),
@@ -867,8 +867,7 @@ The command is run in the host's network environment (similar to
867867

868868
### RUN --security
869869

870-
> **Note**
871-
>
870+
> [!NOTE]
872871
> Not yet available in stable syntax, use [`docker/dockerfile:1-labs`](#syntax) version.
873872
874873
```dockerfile
@@ -880,8 +879,7 @@ With `--security=insecure`, the builder runs the command without sandbox in inse
880879
mode, which allows to run flows requiring elevated privileges (e.g. containerd).
881880
This is equivalent to running `docker run --privileged`.
882881

883-
> **Warning**
884-
>
882+
> [!WARNING]
885883
> In order to access this feature, entitlement `security.insecure` should be
886884
> enabled when starting the buildkitd daemon with
887885
> `--allow-insecure-entitlement security.insecure` flag or in [buildkitd config](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md),
@@ -931,8 +929,7 @@ If `CMD` is used to provide default arguments for the `ENTRYPOINT` instruction,
931929
both the `CMD` and `ENTRYPOINT` instructions should be specified in the
932930
[exec form](#exec-form).
933931

934-
> **Note**
935-
>
932+
> [!NOTE]
936933
> Don't confuse `RUN` with `CMD`. `RUN` actually runs a command and commits
937934
> the result; `CMD` doesn't execute anything at build time, but specifies
938935
> the intended command for the image.
@@ -970,8 +967,7 @@ LABEL multi.label1="value1" \
970967
other="value3"
971968
```
972969

973-
> **Note**
974-
>
970+
> [!NOTE]
975971
> Be sure to use double quotes and not single quotes. Particularly when you are
976972
> using string interpolation (e.g. `LABEL example="foo-$ENV_VAR"`), single
977973
> quotes will take the string as is without unpacking the variable's value.
@@ -1121,6 +1117,7 @@ ARG DEBIAN_FRONTEND=noninteractive
11211117
RUN apt-get update && apt-get install -y ...
11221118
```
11231119

1120+
> [!NOTE]
11241121
> **Alternative syntax**
11251122
>
11261123
> The `ENV` instruction also allows an alternative syntax `ENV <key> <value>`,
@@ -1275,8 +1272,7 @@ The result is the union of:
12751272
2. The contents of the source tree, with conflicts resolved in favor of the
12761273
content being added, on a file-by-file basis.
12771274

1278-
> **Note**
1279-
>
1275+
> [!NOTE]
12801276
> Whether a file is identified as a recognized compression format or not is
12811277
> done solely based on the contents of the file, not the name of the file. For
12821278
> example, if an empty file happens to end with `.tar.gz` this isn't recognized
@@ -1609,8 +1605,7 @@ image or stage that you specify.
16091605

16101606
### COPY --chown --chmod
16111607

1612-
> **Note**
1613-
>
1608+
> [!NOTE]
16141609
> Only octal notation is currently supported. Non-octal support is tracked in
16151610
> [moby/buildkit#1951](https://github.com/moby/buildkit/issues/1951).
16161611
@@ -1731,8 +1726,7 @@ conditions for cache reuse.
17311726

17321727
### COPY --parents
17331728

1734-
> **Note**
1735-
>
1729+
> [!NOTE]
17361730
> Not yet available in stable syntax, use [`docker/dockerfile:1.7-labs`](#syntax) version.
17371731
17381732
```dockerfile
@@ -1789,8 +1783,7 @@ with the `--parents` flag, the Buildkit is capable of packing multiple
17891783

17901784
### COPY --exclude
17911785

1792-
> **Note**
1793-
>
1786+
> [!NOTE]
17941787
> Not yet available in stable syntax, use [`docker/dockerfile:1.7-labs`](#syntax) version.
17951788
17961789
```dockerfile
@@ -1987,8 +1980,7 @@ user 0m 0.03s
19871980
sys 0m 0.03s
19881981
```
19891982

1990-
> **Note**
1991-
>
1983+
> [!NOTE]
19921984
> You can override the `ENTRYPOINT` setting using `--entrypoint`,
19931985
> but this can only set the binary to exec (no `sh -c` will be used).
19941986
@@ -2095,8 +2087,7 @@ The table below shows what command is executed for different `ENTRYPOINT` / `CMD
20952087
| **CMD ["exec_cmd", "p1_cmd"]** | exec_cmd p1_cmd | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry exec_cmd p1_cmd |
20962088
| **CMD exec_cmd p1_cmd** | /bin/sh -c exec_cmd p1_cmd | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry /bin/sh -c exec_cmd p1_cmd |
20972089

2098-
> **Note**
2099-
>
2090+
> [!NOTE]
21002091
> If `CMD` is defined from the base image, setting `ENTRYPOINT` will
21012092
> reset `CMD` to an empty value. In this scenario, `CMD` must be defined in the
21022093
> current image to have a value.
@@ -2174,8 +2165,7 @@ runtime, runs the relevant `ENTRYPOINT` and `CMD` commands.
21742165
> Note that when specifying a group for the user, the user will have _only_ the
21752166
> specified group membership. Any other configured group memberships will be ignored.
21762167
2177-
> **Warning**
2178-
>
2168+
> [!WARNING]
21792169
> When the user doesn't have a primary group then the image (or the next
21802170
> instructions) will be run with the `root` group.
21812171
>
@@ -2243,8 +2233,7 @@ The `ARG` instruction defines a variable that users can pass at build-time to
22432233
the builder with the `docker build` command using the `--build-arg <varname>=<value>`
22442234
flag.
22452235

2246-
> **Warning**
2247-
>
2236+
> [!WARNING]
22482237
> It isn't recommended to use build arguments for passing secrets such as
22492238
> user credentials, API tokens, etc. Build arguments are visible in the
22502239
> `docker history` command and in `max` mode provenance attestations,

frontend/dockerfile/docs/rules/copy-ignored-file.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ aliases:
55
- /go/dockerfile/rule/copy-ignored-file/
66
---
77

8-
> **Note**
9-
>
8+
> [!NOTE]
109
> This check is experimental and is not enabled by default. To enable it, see
1110
> [Experimental checks](https://docs.docker.com/go/build-checks-experimental/).
1211

frontend/dockerfile/linter/generate.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ aliases:
3838
---
3939
{{- if .Rule.Experimental }}
4040
41-
> **Note**
42-
>
41+
> [!NOTE]
4342
> This check is experimental and is not enabled by default. To enable it, see
4443
> [Experimental checks](https://docs.docker.com/go/build-checks-experimental/).
4544
{{- end }}

0 commit comments

Comments
 (0)