Skip to content

Commit 09fae09

Browse files
authored
Merge pull request #21423 from docker/published-update
publish updates from main
2 parents 17ac10a + 0c0ea25 commit 09fae09

File tree

36 files changed

+212
-231
lines changed

36 files changed

+212
-231
lines changed

_vale/Docker/RecommendedWords.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ swap:
1414
(?:sign on|log on|log in|logon|login): sign in
1515
above: previous
1616
adaptor: adapter
17-
admin: administrator
17+
admin(?! console): administrator
1818
administrate: administer
1919
afterwards: afterward
2020
allow: let

_vale/config/vocabularies/Docker/accept.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
(?-i)[A-Z]{2,}s
2-
Admin Console
32
Amazon
43
Anchore
54
Apple

content/get-started/docker-concepts/the-basics/what-is-a-registry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The following diagram shows the relationship between a registry, repositories, a
5252
+---------------------------------------+
5353
```
5454

55-
>**Note**
55+
> [!NOTE]
5656
>
5757
> You can create one private repository and unlimited public repositories using the free version of Docker Hub. For more information, visit the [Docker Hub subscription page](https://www.docker.com/pricing/).
5858
@@ -112,7 +112,7 @@ Don't worry about the specifics of the Dockerfile, as you'll learn about that in
112112
docker build -t <YOUR_DOCKER_USERNAME>/docker-quickstart .
113113
```
114114

115-
>**Note**
115+
> [!NOTE]
116116
>
117117
> Make sure you include the dot (.) at the end of the `docker build` command. This tells Docker where to find the Dockerfile.
118118

content/get-started/workshop/03_updating_app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ To remove a container, you first need to stop it. Once it has stopped, you can r
7272
$ docker rm <the-container-id>
7373
```
7474

75-
>**Note**
75+
> [!NOTE]
7676
>
77-
>You can stop and remove a container in a single command by adding the `force` flag to the `docker rm` command. For example: `docker rm -f <the-container-id>`
77+
> You can stop and remove a container in a single command by adding the `force` flag to the `docker rm` command. For example: `docker rm -f <the-container-id>`
7878
7979
{{< /tab >}}
8080
{{< tab name="Docker Desktop" >}}

content/get-started/workshop/08_using_compose.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,12 @@ quickly see what container is your app and which container is the mysql database
268268
When you're ready to tear it all down, simply run `docker compose down` or hit the trash can on the Docker Desktop Dashboard
269269
for the entire app. The containers will stop and the network will be removed.
270270

271-
>**Warning**
271+
> [!WARNING]
272272
>
273-
>By default, named volumes in your compose file are not removed when you run `docker compose down`. If you want to
273+
> By default, named volumes in your compose file are not removed when you run `docker compose down`. If you want to
274274
>remove the volumes, you need to add the `--volumes` flag.
275275
>
276-
>The Docker Desktop Dashboard does not remove volumes when you delete the app stack.
276+
> The Docker Desktop Dashboard does not remove volumes when you delete the app stack.
277277

278278
## Summary
279279

content/includes/aci-ecs-eol.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
>**Important**
1+
> [!IMPORTANT]
22
>
3-
>Docker Compose's integration for ECS and ACI is retiring in November 2023.
3+
> Docker Compose's integration for ECS and ACI is retiring in November 2023.

content/includes/install-script.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ of the convenience script:
3030
using the script to update an existing installation, dependencies may not be
3131
updated to the expected version, resulting in outdated versions.
3232

33-
> **Tip: preview script steps before running**
33+
> [!TIP]
3434
>
35-
> You can run the script with the `--dry-run` option to learn what steps the
35+
> Preview script steps before running. You can run the script with the `--dry-run` option to learn what steps the
3636
> script will run when invoked:
3737
>
3838
> ```console

content/manuals/build/bake/contexts.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ multiple Dockerfiles that can't be easily merged into one.
9393

9494
## Deduplicate context transfer
9595

96-
> **Note**
96+
> [!NOTE]
9797
>
98-
> As of Buildx version 0.17.0 and later, Bake automatically deduplicates
98+
> As of Buildx version 0.17.0 and later, Bake automatically de-duplicates
9999
> context transfer for targets that share the same context. In addition to
100100
> Buildx version 0.17.0, the builder must be running BuildKit version 0.16.0 or
101101
> later, and the Dockerfile syntax must be `docker/dockerfile:1.10` or later.
102102
>
103-
> If you meet these requirements, you don't need to manually deduplicate
103+
> If you meet these requirements, you don't need to manually de-duplicate
104104
> context transfer as described in this section.
105105
>
106106
> - To check your Buildx version, run `docker buildx version`.

content/manuals/compose/intro/compose-application-model.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ Computing components of an application are defined as [services](/reference/comp
1919

2020
Services communicate with each other through [networks](/reference/compose-file/networks.md). In the Compose Specification, a network is a platform capability abstraction to establish an IP route between containers within services connected together.
2121

22-
Services store and share persistent data into [volumes](/reference/compose-file/volumes.md). The Specification describes such a persistent data as a high-level filesystem mount with global options.
22+
Services store and share persistent data into [volumes](/reference/compose-file/volumes.md). The Specification describes such a persistent data as a high-level filesystem mount with global options.
2323

2424
Some services require configuration data that is dependent on the runtime or platform. For this, the Specification defines a dedicated [configs](/reference/compose-file/configs.md) concept. From a service container point of view, configs are comparable to volumes, in that they are files mounted into the container. But the actual definition involves distinct platform resources and services, which are abstracted by this type.
2525

2626
A [secret](/reference/compose-file/secrets.md) is a specific flavor of configuration data for sensitive data that should not be exposed without security considerations. Secrets are made available to services as files mounted into their containers, but the platform-specific resources to provide sensitive data are specific enough to deserve a distinct concept and definition within the Compose specification.
2727

28-
>**Note**
28+
> [!NOTE]
2929
>
3030
> With volumes, configs and secrets you can have a simple declaration at the top-level and then add more platform-specific information at the service level.
3131

content/manuals/compose/releases/release-notes.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,9 +1004,9 @@ For the full change log or additional information, check the [Compose repository
10041004

10051005
{{< release-date date="2022-09-27" >}}
10061006

1007-
> [!NOTE]
1008-
>
1009-
> - Updates on environment file syntax & interpolation: see [compose#9879](https://github.com/docker/compose/issues/9879)
1007+
> [!NOTE]
1008+
>
1009+
> - Updates on environment file syntax & interpolation: see [compose#9879](https://github.com/docker/compose/issues/9879)
10101010
> - Setting `DOCKER_HOST` via `.env` files is not supported in Compose v2
10111011
10121012
### Updates
@@ -1145,10 +1145,9 @@ For the full change log, check the [Compose repository 2.10.0 release page](http
11451145
> [!IMPORTANT]
11461146
>
11471147
> Compose v2.9.0 contains changes to the environment variable's precedence that have since been reverted. We recommend using v2.10+ to avoid compatibility issues.
1148-
>
11491148
11501149
> [!NOTE]
1151-
>
1150+
>
11521151
> This release reverts the breaking changes introduced in [Compose v2.8.0](#280) by [`compose-go v1.3.0`](https://github.com/compose-spec/compose-go/releases/tag/v1.3.0).
11531152
11541153
### Updates
@@ -1976,8 +1975,9 @@ This release contains minor improvements and bug fixes.
19761975

19771976
- Reverted a 1.23.0 change that appended random strings to container names
19781977
created by `docker-compose up`, causing addressability issues.
1979-
> [!NOTE]: Containers created by `docker-compose run` will continue to use
1980-
randomly generated names to avoid collisions during parallel runs.
1978+
> [!NOTE]
1979+
>
1980+
> Containers created by `docker-compose run` will continue to use randomly generated names to avoid collisions during parallel runs.
19811981
19821982
- Fixed an issue where some `dockerfile` paths would fail unexpectedly when
19831983
attempting to build on Windows.
@@ -2981,7 +2981,10 @@ naming scheme accordingly before upgrading.
29812981
- Containers dependencies can now be set up to wait on positive healthchecks
29822982
when declared using `depends_on`. See the documentation for the updated
29832983
syntax.
2984-
**Note**: This feature will not be ported to version 3 Compose files.
2984+
2985+
> [!NOTE]
2986+
>
2987+
> This feature will not be ported to version 3 Compose files.
29852988
29862989
- Added support for the `sysctls` parameter in service definitions
29872990

0 commit comments

Comments
 (0)