Skip to content

Commit

Permalink
Merge pull request moby#5261 from dvdksn/docs-alert-syntax
Browse files Browse the repository at this point in the history
docs: use gh alert syntax for callouts
  • Loading branch information
tonistiigi authored Aug 19, 2024
2 parents d581877 + 47e0e63 commit 49f3d8f
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 42 deletions.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,12 @@ Introductory blog post https://blog.mobyproject.org/introducing-buildkit-17e056c

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

> **Note**
>
> [!NOTE]
> If you are visiting this repo for the usage of BuildKit-only Dockerfile features
> like `RUN --mount=type=(bind|cache|tmpfs|secret|ssh)`, please refer to the
> [Dockerfile reference](https://docs.docker.com/engine/reference/builder/).
> **Note**
>
> [!NOTE]
> `docker build` [uses Buildx and BuildKit by default](https://docs.docker.com/build/architecture/) since Docker Engine 23.0.
> You don't need to read this document unless you want to use the full-featured
> standalone version of BuildKit.
Expand Down Expand Up @@ -614,8 +612,7 @@ There are 2 options supported for Azure Blob Storage authentication:
* 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.
* 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)

> **Note**
>
> [!NOTE]
> Account name can also be specified with `account_name` attribute (or `$BUILDKIT_AZURE_STORAGE_ACCOUNT_NAME`)
> if it is not part of the account URL host.
Expand Down
3 changes: 1 addition & 2 deletions docs/attestations/sbom-protocol.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ mount, writes its SBOM scan data to a specified directory.
The SBOM generator image is expected to follow the rules of the BuildKit SBOM
generator protocol, defined in this document.

> **Note**
>
> [!NOTE]
> Currently, only SBOMs in the [SPDX](https://spdx.dev) JSON format are
> supported.
>
Expand Down
3 changes: 1 addition & 2 deletions docs/dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
These are the BuildKit developer docs, designed to be read by technical users
interested in contributing to or integrating with BuildKit.

> **Warning**
>
> [!WARNING]
> While these docs attempt to keep up with the current state of our `master`
> development branch, the code is constantly changing and updating, as bugs are
> fixed, and features are added. Remember, the ultimate source of truth is
Expand Down
3 changes: 1 addition & 2 deletions docs/dev/solver.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,7 @@ for its inputs.
after it has completed. In LLB this is used for calculating a cache key based
on the checksum of file contents of the input snapshots.

> **Note**
>
> [!NOTE]
> For example, in the case of LLB, if a vertex is a FileOp that copies a file
> from one snapshot to another, the selector can be set to the path of the
> source file in the input snapshot, while the content-based cache function can
Expand Down
41 changes: 15 additions & 26 deletions frontend/dockerfile/docs/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ world

Comments don't support line continuation characters.

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

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

### RUN --security

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

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

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

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

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

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

### COPY --chown --chmod

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

### COPY --parents

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

### COPY --exclude

> **Note**
>
> [!NOTE]
> Not yet available in stable syntax, use [`docker/dockerfile:1.7-labs`](#syntax) version.
```dockerfile
Expand Down Expand Up @@ -1987,8 +1980,7 @@ user 0m 0.03s
sys 0m 0.03s
```

> **Note**
>
> [!NOTE]
> You can override the `ENTRYPOINT` setting using `--entrypoint`,
> but this can only set the binary to exec (no `sh -c` will be used).
Expand Down Expand Up @@ -2095,8 +2087,7 @@ The table below shows what command is executed for different `ENTRYPOINT` / `CMD
| **CMD ["exec_cmd", "p1_cmd"]** | exec_cmd p1_cmd | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry exec_cmd p1_cmd |
| **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 |

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

> **Warning**
>
> [!WARNING]
> It isn't recommended to use build arguments for passing secrets such as
> user credentials, API tokens, etc. Build arguments are visible in the
> `docker history` command and in `max` mode provenance attestations,
Expand Down
3 changes: 1 addition & 2 deletions frontend/dockerfile/docs/rules/copy-ignored-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ aliases:
- /go/dockerfile/rule/copy-ignored-file/
---

> **Note**
>
> [!NOTE]
> This check is experimental and is not enabled by default. To enable it, see
> [Experimental checks](https://docs.docker.com/go/build-checks-experimental/).
Expand Down
3 changes: 1 addition & 2 deletions frontend/dockerfile/linter/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ aliases:
---
{{- if .Rule.Experimental }}
> **Note**
>
> [!NOTE]
> This check is experimental and is not enabled by default. To enable it, see
> [Experimental checks](https://docs.docker.com/go/build-checks-experimental/).
{{- end }}
Expand Down

0 comments on commit 49f3d8f

Please sign in to comment.