From a99cd5a1317f4252b5319d95f803260f2bdbd14a Mon Sep 17 00:00:00 2001 From: Raphael Cazer <71472751+raaphiixx@users.noreply.github.com> Date: Wed, 5 Feb 2025 09:19:16 +0000 Subject: [PATCH 1/3] Little parts of text outdated for 2024 (#21484) Only 3 changes ## Description I'm learning about docker and i noticed in my terminal some parts was different, only text parts --------- Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- .../the-basics/what-is-docker-compose.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/content/get-started/docker-concepts/the-basics/what-is-docker-compose.md b/content/get-started/docker-concepts/the-basics/what-is-docker-compose.md index 5126fba3646b..90b1db134f2b 100644 --- a/content/get-started/docker-concepts/the-basics/what-is-docker-compose.md +++ b/content/get-started/docker-concepts/the-basics/what-is-docker-compose.md @@ -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 @@ -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 @@ -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. From 6c679a648d5776139e2a23d59367e43c3abdbf59 Mon Sep 17 00:00:00 2001 From: Rashi Chaubal <12rashic@gmail.com> Date: Wed, 5 Feb 2025 14:49:29 +0530 Subject: [PATCH 2/3] fix: clarified rprivate by adding spell out recursive private in volumes.md (#21711) ## Description To avoid confusion of rprivate provided fix: clarified rprivate by adding spell out recursive private in volumes.md ## Related issues or tickets #21688 #21688 ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --------- Signed-off-by: Rashi Chaubal <12rashic@gmail.com> Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/manuals/engine/storage/volumes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/engine/storage/volumes.md b/content/manuals/engine/storage/volumes.md index c99eed561d8c..d99a39fc606d 100644 --- a/content/manuals/engine/storage/volumes.md +++ b/content/manuals/engine/storage/volumes.md @@ -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 From 65585fdd6cef3bb4572f177fcab9c6354e75b748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petteri=20R=C3=A4ty?= Date: Wed, 5 Feb 2025 13:01:18 +0200 Subject: [PATCH 3/3] Fix argument name to docker network create (#21966) ## Description ``` $ docker network create --help | grep opt --ipam-opt map Set IPAM driver specific options (default map[]) -o, --opt map Set driver specific options (default map[]) ``` So the documentation should be changed from using --option to --opt. --- content/manuals/engine/network/drivers/bridge.md | 2 +- content/manuals/engine/network/drivers/ipvlan.md | 2 +- content/manuals/engine/network/drivers/macvlan.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/manuals/engine/network/drivers/bridge.md b/content/manuals/engine/network/drivers/bridge.md index 03d3c402209b..19b80c007737 100644 --- a/content/manuals/engine/network/drivers/bridge.md +++ b/content/manuals/engine/network/drivers/bridge.md @@ -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 | |-------------------------------------------------------------------------------------------------|-----------------------------|------------------------------------------------------------------------------------------------| diff --git a/content/manuals/engine/network/drivers/ipvlan.md b/content/manuals/engine/network/drivers/ipvlan.md index f33e779d9fc2..c5adad016eb9 100644 --- a/content/manuals/engine/network/drivers/ipvlan.md +++ b/content/manuals/engine/network/drivers/ipvlan.md @@ -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 | | ------------- | -------- | --------------------------------------------------------------------- | diff --git a/content/manuals/engine/network/drivers/macvlan.md b/content/manuals/engine/network/drivers/macvlan.md index 3817c011376a..43e67a7a04e3 100644 --- a/content/manuals/engine/network/drivers/macvlan.md +++ b/content/manuals/engine/network/drivers/macvlan.md @@ -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 | | -------------- | -------- | ----------------------------------------------------------------------------- |