Skip to content

Commit 71a3849

Browse files
Apply suggestions from code review
Co-authored-by: Craig Shoemaker <[email protected]>
1 parent 0dee421 commit 71a3849

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

articles/container-apps/azure-pipelines.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ The pipeline is triggered by commits to a specific branch in your repository. Wh
1717

1818
## Container Apps Azure Pipelines task
1919

20-
To build and deploy your container app, add the [`AzureContainerAppsRC`](https://marketplace.visualstudio.com/items?itemName=microsoft-oryx.AzureContainerAppsRC) (preview) Azure Pipelines task to your pipeline. The task supports the following scenarios:
20+
To build and deploy your container app, add the [`AzureContainerAppsRC`](https://marketplace.visualstudio.com/items?itemName=microsoft-oryx.AzureContainerAppsRC) (preview) Azure Pipelines task to your pipeline.
2121

22-
* Build from a Dockerfile and deploy to Container Apps.
23-
* Build from source code without a Dockerfile and deploy to Container Apps. Supported languages include .NET, Node.js, PHP, Python, and Ruby.
24-
* Deploy an existing container image to Container Apps.
22+
The task supports the following scenarios:
23+
24+
* Build from a Dockerfile and deploy to Container Apps
25+
* Build from source code without a Dockerfile and deploy to Container Apps. Supported languages include .NET, Node.js, PHP, Python, and Ruby
26+
* Deploy an existing container image to Container Apps
2527

2628
### Usage examples
2729

@@ -68,11 +70,11 @@ The Azure Container Apps task needs to authenticate with your Azure Container Re
6870

6971
To push images, the task automatically authenticates with the container registry specified in `acrName` using the service connection provided in `azureSubscription`.
7072

71-
To pull images, Azure Container Apps uses either managed identity (recommended) or admin credentials to authenticate with the Azure Container Registry. To use managed identity, the container app the task is deploying to must be [configured to use managed identity](managed-identity-image-pull.md). To authenticate with the registry's admin credentials, set the task's `acrUsername` and `acrPassword` inputs.
73+
To pull images, Azure Container Apps uses either managed identity (recommended) or admin credentials to authenticate with the Azure Container Registry. To use managed identity, the target container app for the task must be [configured to use managed identity](managed-identity-image-pull.md). To authenticate with the registry's admin credentials, set the task's `acrUsername` and `acrPassword` inputs.
7274

7375
## Configuration
7476

75-
You take the following steps to configure an Azure DevOps pipeline to deploy to Azure Container Apps.
77+
Take the following steps to configure an Azure DevOps pipeline to deploy to Azure Container Apps.
7678

7779
> [!div class="checklist"]
7880
> * Create an Azure DevOps repository for your app
@@ -120,15 +122,15 @@ Before creating a pipeline, the source code for your app must be in a repository
120122

121123
### Create a container app and configure managed identity
122124

123-
Create your container app using the `az containerapp up` command in the following steps. This command will create Azure resources, build the container image, store the image in a registry, and deploy to a container app.
125+
Create your container app using the `az containerapp up` command with the following steps. This command creates Azure resources, builds the container image, stores the image in a registry, and deploys to a container app.
124126

125127
After your app is created, you can add a managed identity to your app and assign the identity the `AcrPull` role to allow the identity to pull images from the registry.
126128

127129
[!INCLUDE [container-apps-github-devops-setup.md](../../includes/container-apps-github-devops-setup.md)]
128130

129131
### Install the Azure Container Apps task
130132

131-
The Azure Container Apps Azure Pipelines task is currently in preview. Before you use it, you must install it from the Azure DevOps Marketplace.
133+
The Azure Container Apps Azure Pipelines task is currently in preview. Before you use the task, you must install it from the Azure DevOps Marketplace.
132134

133135
1. Open the [Azure Container Apps task](https://marketplace.visualstudio.com/items?itemName=microsoft-oryx.AzureContainerAppsRC) in the Azure DevOps Marketplace.
134136

@@ -197,6 +199,6 @@ To learn more about service connections, see [Connect to Microsoft Azure](/azure
197199

198200
1. Select **Save and run**.
199201

200-
An Azure Pipelines run should start to build and deploy your container app. To check its progress, navigate to *Pipelines* and select the run. During the first pipeline run, you may be prompted to authorize the pipeline to use your service connection.
202+
An Azure Pipelines run starts to build and deploy your container app. To check its progress, navigate to *Pipelines* and select the run. During the first pipeline run, you may be prompted to authorize the pipeline to use your service connection.
201203

202204
To deploy a new revision of your app, push a new commit to the *main* branch.

articles/container-apps/github-actions.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@ Azure Container Apps allows you to use GitHub Actions to publish [revisions](rev
1515

1616
:::image type="content" source="media/github-actions/azure-container-apps-github-actions.png" alt-text="Changes to a GitHub repo trigger an action to create a new revision.":::
1717

18-
The GitHub Actions workflow is triggered by commits to a specific branch in your repository. When creating the workflow, you decide which branch triggers it.
18+
The GitHub Actions workflow is triggered by commits to a specific branch in your repository. When creating the workflow, you decide which branch triggers the workflow.
1919

20-
This article shows you how to create your own workflow that you can fully customize. To generate a starter GitHub Actions workflow with Azure CLI, see [Generate GitHub Actions workflow with Azure CLI](github-actions-cli.md).
20+
This article shows you how to create a fully customizable workflow. To generate a starter GitHub Actions workflow with Azure CLI, see [Generate GitHub Actions workflow with Azure CLI](github-actions-cli.md).
2121

2222
## Azure Container Apps GitHub action
2323

24-
To build and deploy your container app, you add the [`azure/container-apps-deploy-action`](https://github.com/marketplace/actions/azure-container-apps-build-and-deploy) action to your GitHub Actions workflow. The action supports the following scenarios:
24+
To build and deploy your container app, you add the [`azure/container-apps-deploy-action`](https://github.com/marketplace/actions/azure-container-apps-build-and-deploy) action to your GitHub Actions workflow.
2525

26-
* Build from a Dockerfile and deploy to Container Apps.
27-
* Build from source code without a Dockerfile and deploy to Container Apps. Supported languages include .NET, Node.js, PHP, Python, and Ruby.
28-
* Deploy an existing container image to Container Apps.
26+
The action supports the following scenarios:
27+
28+
* Build from a Dockerfile and deploy to Container Apps
29+
* Build from source code without a Dockerfile and deploy to Container Apps. Supported languages include .NET, Node.js, PHP, Python, and Ruby
30+
* Deploy an existing container image to Container Apps
2931

3032
### Usage examples
3133

0 commit comments

Comments
 (0)