Merge branch 'v1.11' into ts-azure-app-config-subscribe-interval

dapr · Jul 27, 2023 · 500a151 · 500a151
2 parents 4c922ef + eab1584
commit 500a151
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/daprdocs/content/en/concepts/dapr-services/sidecar.md b/daprdocs/content/en/concepts/dapr-services/sidecar.md
@@ -49,25 +49,31 @@ For a detailed list of all available arguments run `daprd --help` or see this [t
    daprd --app-id myapp
    ```
 
-2. Specify the port your application is listening to
+1. Specify the port your application is listening to
 
    ```bash
    daprd --app-id --app-port 5000
    ```
 
-3. If you are using several custom resources and want to specify the location of the resource definition files, use the `--resources-path` argument:
+1. If you are using several custom resources and want to specify the location of the resource definition files, use the `--resources-path` argument:
 
    ```bash
    daprd --app-id myapp --resources-path <PATH-TO-RESOURCES-FILES>
    ```
 
-4. Enable collection of Prometheus metrics while running your app
+1. If you've organized your components and other resources (for example, resiliency policies, subscriptions, or configuration) into separate folders or a shared folder, you can specify multiple resource paths:
+
+   ```bash
+   daprd --app-id myapp --resources-path <PATH-1-TO-RESOURCES-FILES> --resources-path <PATH-2-TO-RESOURCES-FILES>
+   ```
+
+1. Enable collection of Prometheus metrics while running your app
 
    ```bash
    daprd --app-id myapp --enable-metrics
    ```
 
-5. Listen to IPv4 and IPv6 loopback only
+1. Listen to IPv4 and IPv6 loopback only
 
    ```bash
    daprd --app-id myapp --dapr-listen-addresses '127.0.0.1,[::1]'

diff --git a/daprdocs/content/en/reference/cli/dapr-run.md b/daprdocs/content/en/reference/cli/dapr-run.md
@@ -27,7 +27,7 @@ dapr run [flags] [command]
 | `--app-max-concurrency`        |                      | `unlimited`                                                                        | The concurrency level of the application; default is unlimited                                       |
 | `--app-port`, `-p`             | `APP_PORT`           |                                                                                    | The port your application is listening on                                                            |
 | `--app-protocol`, `-P` | | `http` | The protocol Dapr uses to talk to the application. Valid values are: `http`, `grpc`, `https` (HTTP with TLS), `grpcs` (gRPC with TLS), `h2c` (HTTP/2 Cleartext) |
-| `--resources-path`, `-d`      |                      | Linux/Mac: `$HOME/.dapr/components` <br/>Windows: `%USERPROFILE%\.dapr\components`   | The path for components directory                                                                   |
+| `--resources-path`, `-d`      |                      | Linux/Mac: `$HOME/.dapr/components` <br/>Windows: `%USERPROFILE%\.dapr\components`   | The path for resources directory. If you've organized your resources into multiple folders (for example, components in one folder, resiliency policies in another), you can define multiple resource paths. See [example]({{< ref "#examples" >}}) below.                                                                 |
 | `--app-channel-address` | | `127.0.0.1` | The network address the application listens on |
 | `--runtime-path`                  |        |  | Dapr runtime install path |
 | `--config`, `-c`               |                      | Linux/Mac: `$HOME/.dapr/config.yaml` <br/>Windows: `%USERPROFILE%\.dapr\config.yaml` | Dapr configuration file                                                                            |
@@ -78,4 +78,7 @@ dapr run --app-id myapp --app-port 5000 --app-protocol grpc -- go run main.go
 
 # Run a NodeJs application that listens to port 3000 with API logging enabled
 dapr run --app-id myapp --app-port 3000 --enable-api-logging  -- node myapp.js
+
+# Pass multiple resource paths
+dapr run --app-id myapp --resources-path path1 --resources-path path2
 ```