From 6aa8403d80513182382fef9a361adaf57fc35224 Mon Sep 17 00:00:00 2001 From: Bokyeom <79684339+k-kbk@users.noreply.github.com> Date: Tue, 15 Apr 2025 18:12:03 +0900 Subject: [PATCH 1/3] Merge pull request #22426 from k-kbk/patch-1 Fix minor typos in file-watch.md --- content/manuals/compose/how-tos/file-watch.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/manuals/compose/how-tos/file-watch.md b/content/manuals/compose/how-tos/file-watch.md index 2af413a3b5cb..5cef4963916e 100644 --- a/content/manuals/compose/how-tos/file-watch.md +++ b/content/manuals/compose/how-tos/file-watch.md @@ -40,7 +40,7 @@ For example, in a Node.js project, it's not recommended to sync the `node_module The `watch` attribute defines a list of rules that control automatic service updates based on local file changes. -Each rule requires, a `path` pattern and `action` to take when a modification is detected. There are two possible actions for `watch` and depending on +Each rule requires a `path` pattern and `action` to take when a modification is detected. There are two possible actions for `watch` and depending on the `action`, additional fields might be accepted or required. Watch mode can be used with many different languages and frameworks. @@ -95,8 +95,8 @@ image rebuild (e.g. `package.json`). If `action` is set to `sync+restart`, Compose synchronizes your changes with the service containers and restarts it. -`sync+restart` is ideal when config file changes, and you don't need to rebuild the image but just restart the main process of the service containers. -It will work well when you update a database configuration or your `nginx.conf` file for example +`sync+restart` is ideal when the config file changes, and you don't need to rebuild the image but just restart the main process of the service containers. +It will work well when you update a database configuration or your `nginx.conf` file, for example. >[!TIP] > @@ -116,7 +116,7 @@ For `path: ./app/html` and a change to `./app/html/index.html`: ### `ignore` -The `ignore` patterns are relative to the `path` defined in the current `watch` action, not to the project directory. In the following Example 1, the ignore path would be relative to the `./web` directory specified in the `path` attribute. +The `ignore` patterns are relative to the `path` defined in the current `watch` action, not to the project directory. In the following Example 1, the ignore path would be relative to the `./web` directory specified in the `path` attribute. ## Example 1 From 5a79330e6fd4cdcc245e794395ea358bea8c0ee6 Mon Sep 17 00:00:00 2001 From: "Adam.lee" Date: Tue, 15 Apr 2025 20:23:00 +0800 Subject: [PATCH 2/3] Fix some error description in the volumes manual (#22430) ## Description This Pull Request fixes a few error description in the "volumes" manual. ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/engine/storage/volumes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manuals/engine/storage/volumes.md b/content/manuals/engine/storage/volumes.md index 0aa9c3fe708f..a62ca6f0facd 100644 --- a/content/manuals/engine/storage/volumes.md +++ b/content/manuals/engine/storage/volumes.md @@ -494,7 +494,7 @@ $ docker run --rm \ alpine mkdir -p /logs/app1 /logs/app2 $ docker run -d \ --name=app1 \ - --mount src=logs,dst=/var/log/app1/,volume-subpath=app1 \ + --mount src=logs,dst=/var/log/app1,volume-subpath=app1 \ app1:latest $ docker run -d \ --name=app2 \ @@ -552,7 +552,7 @@ volume. The following example assumes that you have two nodes, the first of which is a Docker host and can connect to the second node using SSH. -On the Docker host, install the `vieux/sshfs` plugin: +On the Docker host, install the `rclone/docker-volume-rclone` plugin: ```console $ docker plugin install --grant-all-permissions rclone/docker-volume-rclone --aliases rclone From 458ca8b842871ac4dc647033fd5a96f0136dd637 Mon Sep 17 00:00:00 2001 From: aevesdocker Date: Tue, 15 Apr 2025 13:27:23 +0100 Subject: [PATCH 3/3] network link --- content/manuals/engine/network/tutorials/standalone.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/engine/network/tutorials/standalone.md b/content/manuals/engine/network/tutorials/standalone.md index f9ee9490bce8..3e4c4a09d2a8 100644 --- a/content/manuals/engine/network/tutorials/standalone.md +++ b/content/manuals/engine/network/tutorials/standalone.md @@ -9,7 +9,7 @@ aliases: This series of tutorials deals with networking for standalone Docker containers. For networking with swarm services, see [Networking with swarm services](/manuals/engine/network/tutorials/overlay.md). If you need to -learn more about Docker networking in general, see the [overview](_index.md). +learn more about Docker networking in general, see the [overview](/manuals/engine/network/_index.md). This topic includes two different tutorials. You can run each of them on Linux, Windows, or a Mac, but for the last one, you need a second Docker