Skip to content

Commit 52428ae

Browse files
committed
Clarifications in docker compose section
1 parent 1cd803f commit 52428ae

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

docs/remote/containers.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,15 +461,15 @@ For example:
461461
462462
See the [devcontainer.json reference](#devcontainerjson-reference) for information other available properties such as the `workspaceFolder` and `shutdownAction`.
463463
464-
You could also refer to a development copy of your Docker Compose file. For example, if you had `.devcontainer/docker-compose.devcontainer.yml`, just change the following line:
464+
You can also create a development copy of your Docker Compose file. For example, if you had `.devcontainer/docker-compose.devcontainer.yml`, you would just change the following line in `devcontainer.json`:
465465
466466
```json
467467
"dockerComposeFile": "docker-compose.devcontainer.yml",
468468
```
469469
470-
You can also avoid making a copy of your Docker Compose file by extending your Docker Compose file. We'll cover that [next](#extending-your-docker-compose-file-for-development).
470+
You can also avoid making a copy of your Docker Compose file by extending it with another one. We'll cover this topic in the [next section](#extending-your-docker-compose-file-for-development).
471471
472-
Note that you may want to alter your existing Docker Compose file to mount your local `.gitconfig` folder so you don't have to set up Git inside of the container if you install it. (See [below](#extending-your-docker-compose-file-for-development) if you'd prefer not to alter your existing files.)
472+
Note that you may want to include a volume mount to your local `.gitconfig` folder in your Docker Compose file so you don't have to set up Git inside of the container if you install it.
473473
474474
```yaml
475475
volumes:
@@ -529,7 +529,7 @@ This same file can provide additional settings, such as port mappings, as needed
529529
VS Code will then **automatically use both files** when starting up any containers or you can start them yourself from the command line as follows:
530530
531531
```bash
532-
docker-compose up -f docker-compose.yml -f .devcontainer/docker-compose.yml
532+
docker-compose up -f docker-compose.yml -f .devcontainer/docker-compose.extend.yml
533533
```
534534
535535
### Using an updated Dockerfile to automatically install more tools

0 commit comments

Comments
 (0)