diff --git a/content/guides/databases.md b/content/guides/databases.md index 8cdea6f6a3..2ed465343d 100644 --- a/content/guides/databases.md +++ b/content/guides/databases.md @@ -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: @@ -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. @@ -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: @@ -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: @@ -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: diff --git a/content/guides/golang/develop.md b/content/guides/golang/develop.md index 53497bc9af..c76a693f77 100644 --- a/content/guides/golang/develop.md +++ b/content/guides/golang/develop.md @@ -521,7 +521,7 @@ In this section, you'll create a Docker Compose file to start your `docker-gs-pi ### 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" @@ -582,7 +582,7 @@ The exact value doesn't really matter for this example, because you run Cockroac ### 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: - 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; @@ -608,7 +608,7 @@ Before you apply changes made to a Compose configuration file, there is an oppor $ 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 diff --git a/content/reference/compose-file/services.md b/content/reference/compose-file/services.md index 3b14cc4859..8574628326 100644 --- a/content/reference/compose-file/services.md +++ b/content/reference/compose-file/services.md @@ -400,7 +400,7 @@ services: configs: my_credentials_spec: - file: ./my-credential-spec.json| + file: ./my-credential-spec.json ``` ### `depends_on`