Skip to content

publish updates from main #21971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 5, 2025
Merged

publish updates from main #21971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a99cd5a
Little parts of text outdated for 2024 (#21484)
raaphiixx Feb 5, 2025
6c679a6
fix: clarified rprivate by adding spell out recursive private in volu…
12rashic Feb 5, 2025
65585fd
Fix argument name to docker network create (#21966)
betelgeuse Feb 5, 2025
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
11 changes: 7 additions & 4 deletions content/get-started/docker-concepts/the-basics/what-is-docker-compose.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ Follow the instructions to run the to-do list app on your system.
When you run this command, you should see an output like this:

```console
[+] Running 4/4
✔ app 3 layers [⣿⣿⣿] 0B/0B Pulled 7.1s
[+] Running 5/5
✔ app 3 layers [⣿⣿⣿] 0B/0B Pulled 7.1s
✔ e6f4e57cc59e Download complete 0.9s
✔ df998480d81d Download complete 1.0s
✔ 31e174fedd23 Download complete 2.5s
[+] Running 2/4
✔ 43c47a581c29 Download complete 2.0s
[+] Running 4/4
⠸ Network todo-list-app_default Created 0.3s
⠸ Volume "todo-list-app_todo-mysql-data" Created 0.3s
✔ Container todo-list-app-app-1 Started 0.3s
Expand Down Expand Up @@ -102,7 +103,7 @@ Since this application was started using Docker Compose, it's easy to tear it al
You'll see output similar to the following:

```console
[+] Running 2/2
[+] Running 3/3
✔ Container todo-list-app-mysql-1 Removed 2.9s
✔ Container todo-list-app-app-1 Removed 0.1s
✔ Network todo-list-app_default Removed 0.1s
Expand All @@ -116,6 +117,8 @@ Since this application was started using Docker Compose, it's easy to tear it al
>
> ```console
> docker compose down --volumes
> [+] Running 1/0
> ✔ Volume todo-list-app_todo-mysql-data Removed
> ```

2. Alternatively, you can use the Docker Desktop GUI to remove the containers by selecting the application stack and selecting the **Delete** button.
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/engine/network/drivers/bridge.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ flag.
## Options

The following table describes the driver-specific options that you can pass to
`--option` when creating a custom network using the `bridge` driver.
`--opt` when creating a custom network using the `bridge` driver.

| Option | Default | Description |
|-------------------------------------------------------------------------------------------------|-----------------------------|------------------------------------------------------------------------------------------------|
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/engine/network/drivers/ipvlan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ is no need for port mappings in these scenarios.
## Options

The following table describes the driver-specific options that you can pass to
`--option` when creating a network using the `ipvlan` driver.
`--opt` when creating a network using the `ipvlan` driver.

| Option | Default | Description |
| ------------- | -------- | --------------------------------------------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/engine/network/drivers/macvlan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Keep the following things in mind:
## Options

The following table describes the driver-specific options that you can pass to
`--option` when creating a network using the `macvlan` driver.
`--opt` when creating a network using the `macvlan` driver.

| Option | Default | Description |
| -------------- | -------- | ----------------------------------------------------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/engine/storage/volumes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ If your container generates non-persistent state data, consider using a
increase the container's performance by avoiding writing into the container's
writable layer.

Volumes use `rprivate` bind propagation, and bind propagation isn't
Volumes use `rprivate` (recursive private) bind propagation, and bind propagation isn't
configurable for volumes.

## A volume's lifecycle
Expand Down