diff --git a/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/_index.md b/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/_index.md index c85773ab1..aecd74114 100644 --- a/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/_index.md +++ b/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/_index.md @@ -1,7 +1,7 @@ --- type: docs -title: "Multi-app Run (MapR)" -linkTitle: "Multi-app Run (MapR)" +title: "Multi-app Run" +linkTitle: "Multi-app Run" weight: 300 description: "Support for running multiple Dapr applications with one command" --- \ No newline at end of file diff --git a/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/multi-app-overview.md b/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/multi-app-overview.md index b5b8c7b3c..f2f3fd654 100644 --- a/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/multi-app-overview.md +++ b/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/multi-app-overview.md @@ -1,13 +1,13 @@ --- type: docs -title: Multi-app Run (MapR) overview -linkTitle: MapR overview +title: Multi-app Run overview +linkTitle: Multi-App Run overview weight: 1000 description: Learn the scenarios around running multiple applications with one CLI command --- {{% alert title="Note" color="primary" %}} - MapR (Multi-app Run using `dapr run -f`) is currently a preview feature only supported in Linux/MacOS. + Multi-App Run is currently a preview feature only supported in Linux/MacOS. {{% /alert %}} Let's say you want to run several applications locally to test them together, similar to a production scenario. With a local Kubernetes cluster, you'd be able to do this with helm/deployment YAML files. You'd also have to build them as containers and set up Kubernetes, which can add some complexity. @@ -21,7 +21,7 @@ Instead, you simply want to run them as local executables in self-hosted mode. With Multi-app Run, you can start multiple applications in self-hosted mode using a single `dapr run -f` command using a template file. The template file describes how to start multiple applications as if you had run many separate CLI `run`commands. By default, this template file is called `dapr.yaml`. -## MapR template file +## Multi-App Run template file When you execute `dapr run -f .`, it uses the multi-app template file (named `dapr.yaml`) present in the current directory to run all the applications. @@ -49,7 +49,7 @@ For a more in-depth example and explanation of the template properties, see [Mul ## Locations for resources and configuration files -You have options on where to place your applications' resources and configuration files when using MapR. +You have options on where to place your applications' resources and configuration files when using Multi-App Run. ### Point to one file location (with convention) @@ -57,7 +57,7 @@ You can set all of your applications resources and configurations at the `~/.dap ### Separate file locations for each application (with convention) -When using MapR, each application directory can have a `.dapr` folder, which contains a `config.yaml` file and a `resources` directory. Otherwise, if the `.dapr` directory is not present within the app directory, the default `~/.dapr/resources/` and `~/.dapr/config.yaml` locations are used. +When using Multi-App Run, each application directory can have a `.dapr` folder, which contains a `config.yaml` file and a `resources` directory. Otherwise, if the `.dapr` directory is not present within the app directory, the default `~/.dapr/resources/` and `~/.dapr/config.yaml` locations are used. If you decide to add a `.dapr` directory in each application directory, with a `/resources` directory and `config.yaml` file, you can specify different resources paths for each application. This approach remains within convention by using the default `~/.dapr`. @@ -76,10 +76,10 @@ Even if you've decided to rename your resources folder to something other than ` ## Watch the demo -Watch [this video for an overview on MapR](https://youtu.be/s1p9MNl4VGo?t=2456): +Watch [this video for an overview on Multi-App Run](https://youtu.be/s1p9MNl4VGo?t=2456): ## Next steps -[Unpack the MapR template file and its properties]({{< ref multi-app-template.md >}}) \ No newline at end of file +[Unpack the Multi-App Run template file and its properties]({{< ref multi-app-template.md >}}) \ No newline at end of file diff --git a/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/multi-app-template.md b/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/multi-app-template.md index 4a22f188b..fa0d7dd4f 100644 --- a/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/multi-app-template.md +++ b/daprdocs/content/en/developing-applications/local-development/multi-app-dapr-run/multi-app-template.md @@ -1,16 +1,16 @@ --- type: docs -title: "How to: Use the MapR template file" -linkTitle: "How to: Use the MapR template" +title: "How to: Use the Multi-App Run template file" +linkTitle: "How to: Use the Multi-App Run template" weight: 2000 -description: Unpack the MapR template file and its properties +description: Unpack the Multi-App Run template file and its properties --- {{% alert title="Note" color="primary" %}} - MapR (Multi-app Run using `dapr run -f`) is currently a preview feature only supported in Linux/MacOS. + Multi-App Run is currently a preview feature only supported in Linux/MacOS. {{% /alert %}} -The MapR template file is a YAML file that you can use to run multiple applications at once. In this guide, you'll learn how to: +The Multi-App Run template file is a YAML file that you can use to run multiple applications at once. In this guide, you'll learn how to: - Use the multi-app template - View started applications - Stop the multi-app template @@ -22,9 +22,9 @@ You can use the multi-app template file in one of the following two ways: ### Execute by providing a directory path -When you provide a directory path, the CLI will try to locate the MapR template file, named `dapr.yaml` by default in the directory. If the file is not found, the CLI will return an error. +When you provide a directory path, the CLI will try to locate the Multi-App Run template file, named `dapr.yaml` by default in the directory. If the file is not found, the CLI will return an error. -Execute the following CLI command to read the MapR template file, named `dapr.yaml` by default: +Execute the following CLI command to read the Multi-App Run template file, named `dapr.yaml` by default: ```cmd // the template file needs to be called `dapr.yaml` by default @@ -34,7 +34,7 @@ dapr run -f ### Execute by providing a file path -If the MapR template file is named something other than `dapr.yaml`, then you can provide the relative or absolute file path to the command: +If the Multi-App Run template file is named something other than `dapr.yaml`, then you can provide the relative or absolute file path to the command: ```cmd dapr run -f ./.yaml @@ -63,7 +63,7 @@ dapr stop -f dapr.yaml ## Template file structure -The MapR template file can include the following properties. Below is an example template showing two applications that are configured with some of the properties. +The Multi-App Run template file can include the following properties. Below is an example template showing two applications that are configured with some of the properties. ```yaml version: 1 @@ -101,7 +101,7 @@ The following rules apply for all the paths present in the template file: ## Template properties -The properties for the MapR template align with the `dapr run` CLI flags, [listed in the CLI reference documentation]({{< ref "dapr-run.md#flags" >}}). +The properties for the Multi-App Run template align with the `dapr run` CLI flags, [listed in the CLI reference documentation]({{< ref "dapr-run.md#flags" >}}). | Properties | Required | Details | Example | @@ -138,6 +138,6 @@ The properties for the MapR template align with the `dapr run` CLI flags, [liste ## Next steps -Watch [this video for an overview on MapR](https://youtu.be/s1p9MNl4VGo?t=2456): +Watch [this video for an overview on Multi-App Run](https://youtu.be/s1p9MNl4VGo?t=2456): diff --git a/daprdocs/content/en/getting-started/quickstarts/_index.md b/daprdocs/content/en/getting-started/quickstarts/_index.md index 4e47d39e4..727b9a17b 100644 --- a/daprdocs/content/en/getting-started/quickstarts/_index.md +++ b/daprdocs/content/en/getting-started/quickstarts/_index.md @@ -29,4 +29,3 @@ Hit the ground running with our Dapr quickstarts, complete with code samples aim | [Secrets Management]({{< ref secrets-quickstart.md >}}) | Securely fetch secrets. | | [Configuration]({{< ref configuration-quickstart.md >}}) | Get configuration items and subscribe for configuration updates. | | [Resiliency]({{< ref resiliency >}}) | Define and apply fault-tolerance policies to your Dapr API requests. | - diff --git a/daprdocs/content/en/operations/support/support-preview-features.md b/daprdocs/content/en/operations/support/support-preview-features.md index e17636760..ec474b0f4 100644 --- a/daprdocs/content/en/operations/support/support-preview-features.md +++ b/daprdocs/content/en/operations/support/support-preview-features.md @@ -19,5 +19,5 @@ For CLI there is no explicit opt-in, just the version that this was first made a | **App Middleware** | Allow middleware components to be executed when making service-to-service calls | N/A | [App Middleware]({{}}) | v1.9 | | **App health checks** | Allows configuring app health checks | `AppHealthCheck` | [App health checks]({{}}) | v1.9 | | **Pluggable components** | Allows creating self-hosted gRPC-based components written in any language that supports gRPC. The following component APIs are supported: State stores, Pub/sub, Bindings | N/A | [Pluggable components concept]({{}})| v1.9 | -| **MapR** | Configure multiple Dapr applications from a single configuration file and run from a single command | `dapr run -f` | [MapR]({{< ref multi-app-dapr-run.md >}}) | v1.10 | +| **Multi-App Run** | Configure multiple Dapr applications from a single configuration file and run from a single command | `dapr run -f` | [Multi-App Run]({{< ref multi-app-dapr-run.md >}}) | v1.10 | | **Workflows** | Author workflows as code to automate and orchestrate tasks within your application, like messaging, state management, and failure handling | N/A | [Workflows concept]({{< ref "components-concept#workflows" >}})| v1.10 | \ No newline at end of file diff --git a/daprdocs/content/en/reference/cli/dapr-run.md b/daprdocs/content/en/reference/cli/dapr-run.md index 67e23a240..9191741f4 100644 --- a/daprdocs/content/en/reference/cli/dapr-run.md +++ b/daprdocs/content/en/reference/cli/dapr-run.md @@ -34,7 +34,7 @@ dapr run [flags] [command] | `--dapr-http-port` | `DAPR_HTTP_PORT` | `3500` | The HTTP port for Dapr to listen on | | `--enable-profiling` | | `false` | Enable "pprof" profiling via an HTTP endpoint | | `--help`, `-h` | | | Print the help message | -| `--run-file`, `-f` | | Linux/Mac: `$HOME/.dapr/dapr.yaml` | Run multiple applications at once using a multi-app run (MapR) template file | +| `--run-file`, `-f` | | Linux/Mac: `$HOME/.dapr/dapr.yaml` | Run multiple applications at once using a Multi-App Run template file | | `--image` | | | Use a custom Docker image. Format is `repository/image` for Docker Hub, or `example.com/repository/image` for a custom registry. | | `--log-level` | | `info` | The log verbosity. Valid values are: `debug`, `info`, `warn`, `error`, `fatal`, or `panic` | | `--enable-api-logging` | | `false` | Enable the logging of all API calls from application to Dapr |