Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions content/guides/databases.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ To run a container using the GUI:
1. In the Docker Desktop Dashboard, select the global search at the top of the window.
2. Specify `mysql` in the search box, and select the `Images` tab if not already
selected.
3. Hover over the `msyql` image and select `Run`.
The **Run a new container** model appears.
3. Hover over the `mysql` image and select `Run`.
The **Run a new container** modal appears.
4. Expand **Optional settings**.
5. In the optional settings, specify the following:

Expand Down Expand Up @@ -181,7 +181,7 @@ interact with your MySQL database.
Before you begin, you must remove any containers you previously ran for this
guide. To stop and remove a container, either:

- In a terminal, run `docker remove --force my-mysql` to remove the container
- In a terminal, run `docker rm --force my-mysql` to remove the container
named `my-mysql`.
- Or, in the Docker Desktop Dashboard, select the **Delete** icon next to your
container in the **Containers** view.
Expand Down Expand Up @@ -221,8 +221,8 @@ To run a container using the GUI:
1. In the Docker Desktop Dashboard, select the global search at the top of the window.
2. Specify `mysql` in the search box, and select the `Images` tab if not already
selected.
3. Hover over the `msyql` image and select `Run`.
The **Run a new container** model appears.
3. Hover over the `mysql` image and select `Run`.
The **Run a new container** modal appears.
4. Expand **Optional settings**.
5. In the optional settings, specify the following:

Expand Down Expand Up @@ -392,7 +392,7 @@ data persists:
2. Specify `mysql` in the search box, and select the **Images** tab if not
already selected.
3. Hover over the **mysql** image and select **Run**.
The **Run a new container** model appears.
The **Run a new container** modal appears.
4. Expand **Optional settings**.
5. In the optional settings, specify the following:

Expand Down Expand Up @@ -433,7 +433,7 @@ data persists:
2. Specify `mysql` in the search box, and select the **Images** tab if not
already selected.
3. Hover over the **mysql** image and select **Run**.
The **Run a new container** model appears.
The **Run a new container** modal appears.
4. Expand **Optional settings**.
5. In the optional settings, specify the following:

Expand Down
6 changes: 3 additions & 3 deletions content/guides/golang/develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@

### Configure Docker Compose

In your application's directory, create a new text file named `docker-compose.yml` with the following content.
In your application's directory, create a new text file named `compose.yaml` with the following content.

```yaml
version: "3.8"
Expand Down Expand Up @@ -582,7 +582,7 @@

### Merging Compose files

The file name `docker-compose.yml` is the default file name which `docker compose` command recognizes if no `-f` flag is provided. This means you can have multiple Docker Compose files if your environment has such requirements. Furthermore, Docker Compose files are... composable (pun intended), so multiple files can be specified on the command line to merge parts of the configuration together. The following list is just a few examples of scenarios where such a feature would be very useful:
The file name `compose.yaml` is the default file name which `docker compose` command recognizes if no `-f` flag is provided. This means you can have multiple Docker Compose files if your environment has such requirements. Furthermore, Docker Compose files are... composable (pun intended), so multiple files can be specified on the command line to merge parts of the configuration together. The following list is just a few examples of scenarios where such a feature would be very useful:

Check warning on line 585 in content/guides/golang/develop.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.RecommendedWords] Consider using 'filename' instead of 'file name' Raw Output: {"message": "[Docker.RecommendedWords] Consider using 'filename' instead of 'file name'", "location": {"path": "content/guides/golang/develop.md", "range": {"start": {"line": 585, "column": 45}}}, "severity": "INFO"}

Check failure on line 585 in content/guides/golang/develop.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Vale.Spelling] Did you really mean 'composable'? Raw Output: {"message": "[Vale.Spelling] Did you really mean 'composable'?", "location": {"path": "content/guides/golang/develop.md", "range": {"start": {"line": 585, "column": 264}}}, "severity": "ERROR"}

Check warning on line 585 in content/guides/golang/develop.md

View workflow job for this annotation

GitHub Actions / vale

[vale] reported by reviewdog 🐶 [Docker.Avoid] Consider removing 'very'. Raw Output: {"message": "[Docker.Avoid] Consider removing 'very'.", "location": {"path": "content/guides/golang/develop.md", "range": {"start": {"line": 585, "column": 477}}}, "severity": "WARNING"}

- Using a bind mount for the source code for local development but not when running the CI tests;
- Switching between using a pre-built image for the frontend for some API application vs creating a bind mount for source code;
Expand All @@ -608,7 +608,7 @@
$ docker compose config
```

When this command is run, Docker Compose reads the file `docker-compose.yml`, parses it into a data structure in memory, validates where possible, and prints back the reconstruction of that configuration file from its internal representation. If this isn't possible due to errors, Docker prints an error message instead.
When this command is run, Docker Compose reads the file `compose.yaml`, parses it into a data structure in memory, validates where possible, and prints back the reconstruction of that configuration file from its internal representation. If this isn't possible due to errors, Docker prints an error message instead.

### Build and run the application using Docker Compose

Expand Down
2 changes: 1 addition & 1 deletion content/reference/compose-file/services.md
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ services:

configs:
my_credentials_spec:
file: ./my-credential-spec.json|
file: ./my-credential-spec.json
```

### `depends_on`
Expand Down