Skip to content

Commit 645ec54

Browse files
aevesdockerscopfbukevineguerlainmdelapenya
authored
publish updates from main (#22137)
Automated pull request for publishing docs updates. --------- Co-authored-by: Ville Skyttä <[email protected]> Co-authored-by: Veck Hsiao <[email protected]> Co-authored-by: Etienne Guerlain <[email protected]> Co-authored-by: Manuel de la Peña <[email protected]> Co-authored-by: aevesdocker <[email protected]> Co-authored-by: Veesh Goldman <[email protected]>
2 parents 4c4a1c7 + 006608d commit 645ec54

File tree

40 files changed

+151
-54
lines changed

40 files changed

+151
-54
lines changed

_vale/config/vocabularies/Docker/accept.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Intune
5555
JFrog
5656
Jamf
5757
JetBrains
58+
JUnit
5859
Kerberos
5960
Kitematic
6061
Kubeadm
@@ -80,6 +81,7 @@ Paketo
8081
Postgres
8182
PowerShell
8283
Python
84+
Ryuk
8385
S3
8486
SQLite
8587
Slack

content/guides/genai-leveraging-rag/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The system operates as follows:
3838
3. The found information gets added to the original question before passed to LLM
3939
4. The LLM generates responses that blend the model's inherent knowledge with the this extra information.
4040

41-
To hold this vector information in a efficient manner, we need a special type of database.
41+
To hold this vector information in an efficient manner, we need a special type of database.
4242

4343
## Introduction to Graph databases
4444

content/guides/python/deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ In these Kubernetes YAML file, there are various objects, separated by the `---`
161161
your Python application](configure-ci-cd.md).
162162
- A Service, which will define how the ports are mapped in the containers.
163163
- A PersistentVolumeClaim, to define a storage that will be persistent through restarts for the database.
164-
- A Secret, Keeping the database password as a example using secret kubernetes resource.
164+
- A Secret, Keeping the database password as an example using secret kubernetes resource.
165165
- A NodePort service, which will route traffic from port 30001 on your host to
166166
port 8001 inside the pods it routes to, allowing you to reach your app
167167
from the network.

content/guides/ruby/develop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ $ docker compose watch
176176

177177
Any changes to the application's source files on your local machine will now be immediately reflected in the running container.
178178

179-
Open `docker-ruby-on-rails/app/views/whales/index.html.erb` in an IDE or text editor and update the `Whales` string by adding a exclamation marks.
179+
Open `docker-ruby-on-rails/app/views/whales/index.html.erb` in an IDE or text editor and update the `Whales` string by adding an exclamation mark.
180180

181181
```diff
182182
- <h1>Whales</h1>

content/manuals/_index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ params:
2626
description: Define and run multi-container applications.
2727
icon: /assets/icons/Compose.svg
2828
link: /compose/
29+
- title: Testcontainers OSS
30+
description: Run containers programmatically in your preferred programming language.
31+
icon: /assets/icons/Testcontainers.svg
32+
link: /testcontainers/
2933
products:
3034
- title: Docker Desktop
3135
description: Your command center for container development.

content/manuals/build/bake/compose-file.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Bake supports the [Compose file format](/reference/compose-file/_index.md)
1010
to parse a Compose file and translate each service to a [target](reference.md#target).
1111

1212
```yaml
13-
# docker-compose.yml
13+
# compose.yaml
1414
services:
1515
webapp-dev:
1616
build: &build-dev
@@ -106,7 +106,7 @@ where the command is executed and applied to compose definitions passed
106106
with `-f`.
107107

108108
```yaml
109-
# docker-compose.yml
109+
# compose.yaml
110110
services:
111111
webapp:
112112
image: docker.io/username/webapp:${TAG:-v1.0.0}
@@ -152,7 +152,7 @@ the [special extension](/reference/compose-file/extension.md) field
152152
`x-bake` in your compose file to evaluate extra fields:
153153

154154
```yaml
155-
# docker-compose.yml
155+
# compose.yaml
156156
services:
157157
addon:
158158
image: ct-addon:bar

content/manuals/compose/how-tos/environment-variables/envvars-precedence.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ In the following example, a different value for the same environment variable in
3030
$ cat ./webapp.env
3131
NODE_ENV=test
3232

33-
$ cat compose.yml
33+
$ cat compose.yaml
3434
services:
3535
webapp:
3636
image: 'webapp'

content/manuals/compose/how-tos/environment-variables/envvars.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Specifies the path to a Compose file. Specifying multiple Compose files is suppo
7474
For example:
7575

7676
```console
77-
COMPOSE_FILE=docker-compose.yml:docker-compose.prod.yml
77+
COMPOSE_FILE=compose.yaml:compose.prod.yaml
7878
```
7979
The path separator can also be customized using [`COMPOSE_PATH_SEPARATOR`](#compose_path_separator).
8080

content/manuals/compose/how-tos/environment-variables/set-environment-variables.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ A container's environment is not set until there's an explicit entry in the serv
2020
## Use the `environment` attribute
2121

2222
You can set environment variables directly in your container's environment with the
23-
[`environment` attribute](/reference/compose-file/services.md#environment) in your `compose.yml`.
23+
[`environment` attribute](/reference/compose-file/services.md#environment) in your `compose.yaml`.
2424

2525
It supports both list and mapping syntax:
2626

@@ -74,7 +74,7 @@ It can also help you keep your environment variables separate from your main con
7474

7575
The [`env_file` attribute](/reference/compose-file/services.md#env_file) also lets you use multiple `.env` files in your Compose application.
7676

77-
The paths to your `.env` file, specified in the `env_file` attribute, are relative to the location of your `compose.yml` file.
77+
The paths to your `.env` file, specified in the `env_file` attribute, are relative to the location of your `compose.yaml` file.
7878

7979
> [!IMPORTANT]
8080
>

content/manuals/compose/how-tos/environment-variables/variable-interpolation.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Below is a simple example:
2121
```console
2222
$ cat .env
2323
TAG=v1.5
24-
$ cat compose.yml
24+
$ cat compose.yaml
2525
services:
2626
web:
2727
image: "webapp:${TAG}"
@@ -98,7 +98,7 @@ services:
9898

9999
#### Additional information
100100

101-
- If you define a variable in your `.env` file, you can reference it directly in your `compose.yml` with the [`environment` attribute](/reference/compose-file/services.md#environment). For example, if your `.env` file contains the environment variable `DEBUG=1` and your `compose.yml` file looks like this:
101+
- If you define a variable in your `.env` file, you can reference it directly in your `compose.yaml` with the [`environment` attribute](/reference/compose-file/services.md#environment). For example, if your `.env` file contains the environment variable `DEBUG=1` and your `compose.yaml` file looks like this:
102102
```yaml
103103
services:
104104
webapp:
@@ -163,14 +163,14 @@ $ docker compose --env-file ./config/.env.dev up
163163

164164
#### Additional information
165165

166-
- This method is useful if you want to temporarily override an `.env` file that is already referenced in your `compose.yml` file. For example you may have different `.env` files for production ( `.env.prod`) and testing (`.env.test`).
166+
- This method is useful if you want to temporarily override an `.env` file that is already referenced in your `compose.yaml` file. For example you may have different `.env` files for production ( `.env.prod`) and testing (`.env.test`).
167167
In the following example, there are two environment files, `.env` and `.env.dev`. Both have different values set for `TAG`.
168168
```console
169169
$ cat .env
170170
TAG=v1.5
171171
$ cat ./config/.env.dev
172172
TAG=v1.6
173-
$ cat compose.yml
173+
$ cat compose.yaml
174174
services:
175175
web:
176176
image: "webapp:${TAG}"

0 commit comments

Comments
 (0)