Skip to content

Commit 3726c1a

Browse files
Modified Markdown intended to be read in GitHub to utilize [!NOTE] format (#5776)
1 parent 1ba3c6c commit 3726c1a

16 files changed

+92
-71
lines changed

.markdownlint.json

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"MD022": false, // blanks-around-headings Headings should be surrounded by blank lines
1010
"MD024": false, // no-duplicate-heading Multiple headings with the same content
1111
"MD025": false, // single-title/single-h1 Multiple top-level headings in the same document
12-
"MD028": false, // no-blanks-blockquote Blank line inside blockquote
1312
"MD034": false, // no-bare-urls Bare URL used
1413
"MD036": false, // no-emphasis-as-heading Emphasis used instead of a heading
1514
"MD041": false, // first-line-heading/first-line-h1 First line in a file should be a top-level heading

documentation/image-artifact-details.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ FROM mcr.microsoft.com/cbl-mariner/base/core:2.0
100100
COPY --from=distroless / /distroless
101101
```
102102

103-
Note the last instruction copies the entire contents of the distroless container's filesystem to the `/distroless` directory in the wrapper.
104-
This will be the target location used when executing commands.
103+
> [!NOTE]
104+
> The last instruction copies the entire contents of the distroless container's filesystem to the `/distroless` directory in the wrapper.
105+
> This will be the target location used when executing commands.
105106
106107
Next, build the Dockerfile, specifying the distroless image tag you wish to inspect:
107108

documentation/scenarios/nuget-credentials.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ COPY --from=build /app/out ./
207207
ENTRYPOINT ["dotnet", "dotnetapp.dll"]
208208
```
209209

210-
_Note that a script is called to install the Credential Provider. When `dotnet restore` is run, the Credential Provider is invoked to resolve the credentials and it retrieves them from the `VSS_NUGET_EXTERNAL_FEED_ENDPOINTS` environment variable._
210+
> [!NOTE]
211+
> A script is called to install the Credential Provider. When `dotnet restore` is run, the Credential Provider is invoked to resolve the credentials and it retrieves them from the `VSS_NUGET_EXTERNAL_FEED_ENDPOINTS` environment variable.
211212
212213
Before running `docker build`, first populate the `FEED_ACCESSTOKEN` environment variable with a [personal access token](https://docs.microsoft.com/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate). Then, this Dockerfile would be built using this command:
213214

documentation/supported-tags.md

+29-27
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ They include:
5252
- Debian, unless specified (like `8.0-alpine`).
5353
- All [supported architectures](supported-platforms.md#architectures).
5454

55-
> Note: Since .NET 8, these multi-platform tags **specifically exclude all Windows versions** due to `containerd`'s platform matching algorithm for Windows hosts.
55+
> [!NOTE]
56+
> Since .NET 8, these multi-platform tags **specifically exclude all Windows versions** due to `containerd`'s platform matching algorithm for Windows hosts.
57+
5658
Please see [#4492 (Switch multi-platform tags to Linux only)](https://github.com/dotnet/dotnet-docker/issues/4492) for more context.
5759
If you are using Windows, you will need to explicitly specify an OS Version with a single-platform tag like so:
5860

@@ -90,11 +92,11 @@ Examples:
9092
- `6.0-alpine`
9193
- `8.0-alpine`
9294

93-
Notes:
94-
95-
- New versions of Alpine will be published with version-specific tags (e.g. `6.0-alpine3.20`).
96-
- Floating tag (e.g. `6.0-alpine`) will be updated with the new Alpine version a month later.
97-
- Tag changes will be [announced](https://github.com/dotnet/dotnet-docker/discussions/categories/announcements) so that users know when the tags they want are available.
95+
> [!NOTE]
96+
>
97+
> - New versions of Alpine will be published with version-specific tags (e.g. `6.0-alpine3.20`).
98+
> - Floating tag (e.g. `6.0-alpine`) will be updated with the new Alpine version a month later.
99+
> - Tag changes will be [announced](https://github.com/dotnet/dotnet-docker/discussions/categories/announcements) so that users know when the tags they want are available.
98100
99101
### `<Major.Minor.Patch .NET Version>`
100102

@@ -131,10 +133,10 @@ For more information, see the [Image Variants documentation](./image-variants.md
131133

132134
These "floating version" `latest` tag references an image with the latest `Major.Minor.Patch` .NET version, while operating system and architecture will be chosen based on the requesting environment.
133135

134-
Notes:
135-
136-
- The `latest` tag references the latest stable release.
137-
- In the `nightly` image repo, it may reference the latest preview release.
136+
> [!NOTE]
137+
>
138+
> - The `latest` tag references the latest stable release.
139+
> - In the `nightly` image repo, it may reference the latest preview release.
138140
139141
## Tag policies
140142

@@ -149,12 +151,12 @@ Examples:
149151
- `6.0.32`
150152
- `8.0.7-alpine3.20`
151153

152-
Notes:
153-
154-
- These tags are considered _fixed tags_ since they reference a specific .NET patch version.
155-
- They are updated in response to base image updates (like a Debian base image) for the supported life of the image (typically one month).
156-
- The .NET components within the image will not be updated.
157-
- In the rare event that .NET components are updated before the next regular .NET service release, then a new image with a `-1` tag will be created. The same practice will repeat itself if necessary (with `-2` and then `-3` tags).
154+
> [!NOTE]
155+
>
156+
> - These tags are considered _fixed tags_ since they reference a specific .NET patch version.
157+
> - They are updated in response to base image updates (like a Debian base image) for the supported life of the image (typically one month).
158+
> - The .NET components within the image will not be updated.
159+
> - In the rare event that .NET components are updated before the next regular .NET service release, then a new image with a `-1` tag will be created. The same practice will repeat itself if necessary (with `-2` and then `-3` tags).
158160
159161
### Floating version tags
160162

@@ -165,11 +167,11 @@ Examples:
165167
- `6.0`
166168
- `8.0-alpine3.20`
167169

168-
Notes:
169-
170-
- These tags are considered _floating tags_ since they do not reference a specific .NET patch version.
171-
- They are updated in response to base image updates (like a Debian base image) for the supported life of the .NET release.
172-
- The .NET components within the image will be updated, which typically occurs on Patch Tuesday.
170+
> [!NOTE]
171+
>
172+
> - These tags are considered _floating tags_ since they do not reference a specific .NET patch version.
173+
> - They are updated in response to base image updates (like a Debian base image) for the supported life of the .NET release.
174+
> - The .NET components within the image will be updated, which typically occurs on Patch Tuesday.
173175
174176
### OS tags and base image updates
175177

@@ -180,12 +182,12 @@ Examples:
180182
- `6.0-jammy`
181183
- `8.0-alpine3.20`
182184

183-
Notes:
184-
185-
- These tags are updated in response to base image updates (like an Ubuntu base image) for the supported life of the .NET release.
186-
- Digest pinning is required to request a specific patch of an operating system (e.g. `mcr.microsoft.com/dotnet/runtime@sha256:4d3d5a5131a0621509ab8a75f52955f2d0150972b5c5fb918e2e59d4cb9a9823`).
187-
- If an image is only available for one operating system, then the operating system will be omitted from the tag.
188-
- For [Debian](https://en.wikipedia.org/wiki/Debian_version_history) and [Ubuntu](https://en.wikipedia.org/wiki/Ubuntu_version_history) images, release codenames are used instead of version numbers.
185+
> [!NOTE]
186+
>
187+
> - These tags are updated in response to base image updates (like an Ubuntu base image) for the supported life of the .NET release.
188+
> - Digest pinning is required to request a specific patch of an operating system (e.g. `mcr.microsoft.com/dotnet/runtime@sha256:4d3d5a5131a0621509ab8a75f52955f2d0150972b5c5fb918e2e59d4cb9a9823`).
189+
> - If an image is only available for one operating system, then the operating system will be omitted from the tag.
190+
> - For [Debian](https://en.wikipedia.org/wiki/Debian_version_history) and [Ubuntu](https://en.wikipedia.org/wiki/Ubuntu_version_history) images, release codenames are used instead of version numbers.
189191
190192
### Windows tags
191193

samples/aspnetapp/README.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
This sample demonstrates how to build container images for ASP.NET Core web apps. See [.NET Docker Samples](../README.md) for more samples.
44

5-
> Note: .NET 8 container images use port `8080`, by default. Previous .NET versions used port `80`. The instructions for the sample assume the use of port `8080`.
5+
> [!NOTE]
6+
> .NET 8 container images use port `8080`, by default. Previous .NET versions used port `80`. The instructions for the sample assume the use of port `8080`.
67
78
## Run the sample image
89

@@ -39,7 +40,8 @@ Supported with .NET Core 1.0+
3940
ASPNETCORE_URLS=http://+:80
4041
```
4142

42-
> Note: `ASPNETCORE_URLS` overwrites `ASPNETCORE_HTTP_PORTS` if set.
43+
> [!NOTE]
44+
> `ASPNETCORE_URLS` overwrites `ASPNETCORE_HTTP_PORTS` if set.
4345
4446
These environment variables are used in [.NET 8](https://github.com/dotnet/dotnet-docker/blob/6da64f31944bb16ecde5495b6a53fc170fbe100d/src/runtime-deps/8.0/bookworm-slim/amd64/Dockerfile#L7C5-L7C31) and [.NET 6](https://github.com/dotnet/dotnet-docker/blob/6da64f31944bb16ecde5495b6a53fc170fbe100d/src/runtime-deps/6.0/bookworm-slim/amd64/Dockerfile#L5) Dockerfiles, respectively.
4547

@@ -64,7 +66,8 @@ info: Microsoft.Hosting.Lifetime[0]
6466

6567
After the application starts, navigate to `http://localhost:8000` in your web browser. You can also view the ASP.NET Core site running in the container from another machine with a local IP address such as `http://192.168.1.18:8000`.
6668

67-
> Note: ASP.NET Core apps (in official images) listen to [port 8080 by default](https://github.com/dotnet/dotnet-docker/blob/6da64f31944bb16ecde5495b6a53fc170fbe100d/src/runtime-deps/8.0/bookworm-slim/amd64/Dockerfile#L7), starting with .NET 8. The [`-p` argument](https://docs.docker.com/engine/reference/commandline/run/#publish) in these examples maps host port `8000` to container port `8080` (`host:container` mapping). The container will not be accessible without this mapping. ASP.NET Core can be [configured to listen on a different or additional port](https://learn.microsoft.com/aspnet/core/fundamentals/servers/kestrel/endpoints).
69+
> [!NOTE]
70+
> ASP.NET Core apps (in official images) listen to [port 8080 by default](https://github.com/dotnet/dotnet-docker/blob/6da64f31944bb16ecde5495b6a53fc170fbe100d/src/runtime-deps/8.0/bookworm-slim/amd64/Dockerfile#L7), starting with .NET 8. The [`-p` argument](https://docs.docker.com/engine/reference/commandline/run/#publish) in these examples maps host port `8000` to container port `8080` (`host:container` mapping). The container will not be accessible without this mapping. ASP.NET Core can be [configured to listen on a different or additional port](https://learn.microsoft.com/aspnet/core/fundamentals/servers/kestrel/endpoints).
6871
6972
You can see the app running via `docker ps`.
7073

samples/build-for-a-platform.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ The `--platform` argument is the best way to specify the desired architecture. T
7979

8080
In addition, Docker [Buildkit exposes multiple environment variables](https://github.com/dotnet/dotnet-docker/pull/4387#issuecomment-1416565213) that can be used to further conditionalize behavior. These environment variables can be controlled with the pattern demonstrated in [Dockerfile](https://github.com/mthalman/dredge/blob/main/src/Valleysoft.Dredge/Dockerfile). As mentioned, .NET doesn't support being run in emulation. The pattern in that Dockerfile results in the SDK always being run natively while the final image is affected by the `--platform` switch. This model also has the best performance since the bulk of computation is run natively.
8181

82-
> Note: We are enabling the following model in a future release: https://github.com/dotnet/dotnet-docker/issues/4388#issuecomment-1421401384.
82+
> [!NOTE]
83+
> We are enabling the following model in a future release: https://github.com/dotnet/dotnet-docker/issues/4388#issuecomment-1421401384.
8384
8485
## .NET and QEMU
8586

samples/complexapp/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ There are two primary ways to test within the workflow of an application contain
4545

4646
This is different than running tests within a [.NET SDK container](../run-tests-in-sdk-container.md), which establishes a generic environment (which also works well). The rest of this document is focused on running tests within the same container environment as the application.
4747

48-
> Note: See [Establishing docker environment](../establishing-docker-environment.md) for more information on correctly configuring Dockerfiles and `docker build` commands.
48+
> [!NOTE]
49+
> See [Establishing docker environment](../establishing-docker-environment.md) for more information on correctly configuring Dockerfiles and `docker build` commands.
4950
5051
## Running tests as an opt-in stage
5152

samples/deploy-container-to-aci.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ docker build --pull -t aspnetapp -f Dockerfile .
1818

1919
Create an ACR registry per the instructions at [Push Docker Images to Azure Container Registry](push-image-to-acr.md). The following is a summarized version of those instructions.
2020

21-
> Note: Change the password location and the user account ("rich" and "richlander") example values in your environment.
21+
> [!NOTE]
22+
> Change the password location and the user account ("rich" and "richlander") example values in your environment.
2223
2324
```console
2425
az login

samples/host-aspnetcore-https.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ dotnet dev-certs https --trust
5959
```
6060

6161
> [!NOTE]
62-
> `dotnet dev-certs https --trust` is only supported on macOS and Windows. You need to trust certs on Linux in the way that is supported by your distro. It is likely that you need to trust the certificate in your browser.
63-
64-
> [!NOTE]
65-
> `<CREDENTIAL_PLACEHOLDER>` is used as a stand-in for a password of your own choosing.
62+
>
63+
> - `dotnet dev-certs https --trust` is only supported on macOS and Windows. You need to trust certs on Linux in the way that is supported by your distro. It is likely that you need to trust the certificate in your browser.
64+
> - `<CREDENTIAL_PLACEHOLDER>` is used as a stand-in for a password of your own choosing.
6665
6766
Run the container image with ASP.NET Core configured for HTTPS:
6867

samples/kubernetes/graceful-shutdown/graceful-shutdown.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ public class DelayedShutdownHostLifetime : IHostLifetime, IDisposable
107107
}
108108
```
109109

110-
> Note: do not confuse `IHostLifetime` with `IHostApplicationLifetime`--they are related, but different interfaces. It is the `IHostLifetime` instance that listens for signals, including `SIGTERM`, and once a signal arrives, it calls into `IHostApplicationLifetime` instance to orchestrate application shutdown. For more information see [generic host shutdown documentation](https://learn.microsoft.com/dotnet/core/extensions/generic-host#host-shutdown)
110+
> [!NOTE]
111+
> Do not confuse `IHostLifetime` with `IHostApplicationLifetime`--they are related, but different interfaces. It is the `IHostLifetime` instance that listens for signals, including `SIGTERM`, and once a signal arrives, it calls into `IHostApplicationLifetime` instance to orchestrate application shutdown. For more information see [generic host shutdown documentation](https://learn.microsoft.com/dotnet/core/extensions/generic-host#host-shutdown)
111112
112113
Make ASP.NET use `DelayedShutdownHostLifetime` by adding it to the dependency injection container:
113114

samples/push-image-to-acr.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ docker run --rm dotnetapp
2626

2727
The following example demonstrates how to create a private ACR Registry. Once an image is in ACR, it is easy to deploy it to ACI.
2828

29-
> Note: The instructions use example values that need to be changed to for your environment, specifically the password location, and the user account. More simply, make sure to change "rich" and "richlander" to something else.
29+
> [!NOTE]
30+
> The instructions use example values that need to be changed to for your environment, specifically the password location, and the user account. More simply, make sure to change "rich" and "richlander" to something else.
3031
3132
```console
3233
az login

samples/push-image-to-dockerhub.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ You need to [login to Docker Hub](https://docs.docker.com/docker-hub/accounts/)
3434

3535
There are a couple ways of passing a password to `docker login`. These instructions [pass the password to stdin](https://github.com/docker/cli/pull/218) via a text file called password-dh.txt. Make sure to save to a location not managed by source control (to avoid accidental disclosure).
3636

37-
> Note: The instructions use example values that need to be changed to for your environment, specifically the password location, and the user account. More simply, make sure to change "rich" and "richlander" to something else.
37+
> [!NOTE]
38+
> The instructions use example values that need to be changed to for your environment, specifically the password location, and the user account. More simply, make sure to change "rich" and "richlander" to something else.
3839
3940
Login on Windows:
4041

samples/releasesapi/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
This app demonstrates publishing an app as [native AOT](https://learn.microsoft.com/dotnet/core/deploying/native-aot/) in containers.
44

5-
> Note: The base images used by this sample are in preview.
5+
> [!NOTE]
6+
> The base images used by this sample are in preview.
67
78
A similar console app sample supports [single file deployment](../releasesapp/README.md) (non-AOT scenario). This app could also be deployed that way.
89

0 commit comments

Comments
 (0)