From 88a14efd5761ea4bbc026345e63eefa9380de7f5 Mon Sep 17 00:00:00 2001 From: Julia Kulla-Mader Date: Fri, 17 Sep 2021 10:11:12 -0400 Subject: [PATCH] app service naming updates (#3727) --- docs/demo-gen/use-demo-generator-v2.md | 2 +- docs/pipelines/apps/cd/azure/aspnet-core-to-acr.md | 4 ++-- docs/pipelines/apps/includes/azure-web-app-setup.md | 2 +- docs/pipelines/ecosystems/php.md | 2 +- docs/pipelines/library/connect-to-azure.md | 2 +- docs/pipelines/overview-azure.md | 4 ++-- docs/pipelines/release/define-multistage-release-process.md | 2 +- docs/pipelines/release/deploy-iot-using-azure-pipelines.md | 2 +- docs/pipelines/release/integrate-jenkins-pipelines-aks.md | 2 +- docs/pipelines/targets/webapp-on-container-linux.md | 2 +- docs/pipelines/tasks/deploy/azure-rm-web-app.md | 2 +- docs/pipelines/toc.yml | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/demo-gen/use-demo-generator-v2.md b/docs/demo-gen/use-demo-generator-v2.md index f0c9da0b494..ed69c2a6b02 100644 --- a/docs/demo-gen/use-demo-generator-v2.md +++ b/docs/demo-gen/use-demo-generator-v2.md @@ -36,7 +36,7 @@ ms.date: 10/10/2019 The default template is **SmartHotel360**, which contains complete ASP.NET 2 web mobile and desktop business apps for a hotel, and can be deployed using Docker containers. - There are several other templates available, including **MyHealthClinic**, which defines a team project for an ASP.NET Core app that deploys to Azure App Service; **PartsUnlimited**, which defines an ASP.NET app with customized CI/CD pipelines; and **MyShuttle**, which defines a Java app and Azure App service deployment. If you are following a lab from [Azure DevOps Labs](https://www.azuredevopslabs.com), select the **DevOps Labs** tab to choose the template + There are several other templates available, including **MyHealthClinic**, which defines a team project for an ASP.NET Core app that deploys to Azure App Service; **PartsUnlimited**, which defines an ASP.NET app with customized CI/CD pipelines; and **MyShuttle**, which defines a Java app and Azure App Service deployment. If you are following a lab from [Azure DevOps Labs](https://www.azuredevopslabs.com), select the **DevOps Labs** tab to choose the template > [!NOTE] > All templates provide fictional Azure DevOps users and pre-populated Agile planning and tracking work items and data, along with source code in an Azure Repos Git repo, as well as access to Azure Pipelines. diff --git a/docs/pipelines/apps/cd/azure/aspnet-core-to-acr.md b/docs/pipelines/apps/cd/azure/aspnet-core-to-acr.md index 0ed7f2dc1b0..51c7987be0a 100644 --- a/docs/pipelines/apps/cd/azure/aspnet-core-to-acr.md +++ b/docs/pipelines/apps/cd/azure/aspnet-core-to-acr.md @@ -5,7 +5,7 @@ ms.author: mlearned author: mlearned ms.assetid: EF5F37B7-774B-410C-8A82-83F722EF9692 ms.custom: "mvc, seodec18" -ms.date: 09/07/2021 +ms.date: 09/17/2021 monikerRange: 'azure-devops' --- @@ -13,7 +13,7 @@ monikerRange: 'azure-devops' **Azure Pipelines** -Azure Pipelines provides a highly customizable continuous integration (CI) and continuous deployment (CD) pipeline for your ASP.NET Core apps. This quickstart shows how to set up CI and CD to deploy an ASP.NET Core application to Linux App Service using Docker and [Azure Container Registry](/azure/container-registry/). +Azure Pipelines provides a highly customizable continuous integration (CI) and continuous deployment (CD) pipeline for your ASP.NET Core apps. This quickstart shows how to set up CI and CD to deploy an ASP.NET Core application to Azure App Service Custom Containers using Docker and [Azure Container Registry](/azure/container-registry/). ![A typical release pipeline for web applications](media/aspnet-core-to-acr/cicddockerflow.png) diff --git a/docs/pipelines/apps/includes/azure-web-app-setup.md b/docs/pipelines/apps/includes/azure-web-app-setup.md index fcc3200c64d..252bacec039 100644 --- a/docs/pipelines/apps/includes/azure-web-app-setup.md +++ b/docs/pipelines/apps/includes/azure-web-app-setup.md @@ -7,7 +7,7 @@ author: juliakm ms.date: 02/13/2020 --- -### Create the Azure app service +### Create the Azure App Aervice An [Azure App Service](/azure/app-service/overview) is where you'll deploy your application. Technically speaking, an app service is a resource with a specific pricing tier in Azure that can then host multiple, distinct applications. In this example we'll use a [Web App](/azure/app-service/overview). If you're creating a new App Service for this example, you can use the [Free pricing tier](https://azure.microsoft.com/pricing/details/app-service/). diff --git a/docs/pipelines/ecosystems/php.md b/docs/pipelines/ecosystems/php.md index 98f2458df80..79391efd818 100644 --- a/docs/pipelines/ecosystems/php.md +++ b/docs/pipelines/ecosystems/php.md @@ -17,7 +17,7 @@ author: vijayma Create a pipeline that continuously builds, deploys, and tests your PHP projects. -For an end-to-end walkthrough of deploying to Azure App Service with a pipeline, see [Build and deploy to a PHP web app](php-webapp.md). +For an end-to-end walkthrough of deploying to Azure App Service on Linux with a pipeline, see [Build and deploy to a PHP web app](php-webapp.md). ## Create your first pipeline diff --git a/docs/pipelines/library/connect-to-azure.md b/docs/pipelines/library/connect-to-azure.md index 18cf67bb4fb..cedf8cfb17a 100644 --- a/docs/pipelines/library/connect-to-azure.md +++ b/docs/pipelines/library/connect-to-azure.md @@ -55,7 +55,7 @@ We recommend this simple approach if: 1. To deploy to a specific Azure resource, the task will need additional data about that resource. - * If you're using the classic editor, select data you need. For example, the App service name. + * If you're using the classic editor, select data you need. For example, the App Service name. * If you're using YAML, then go to the resource in the Azure portal, and then copy the data into your code. For example, to deploy a web app, you would copy the name of the App Service into the `WebAppName` value. > [!NOTE] diff --git a/docs/pipelines/overview-azure.md b/docs/pipelines/overview-azure.md index 3adc7677f99..0b3522ab90a 100644 --- a/docs/pipelines/overview-azure.md +++ b/docs/pipelines/overview-azure.md @@ -34,7 +34,7 @@ If you're just getting started, we recommend you review and get started with the [Azure DevOps Projects/Azure DevOps Starter](https://azure.microsoft.com/features/devops-projects/) :::column-end::: :::column span="3"::: - Start using Azure Pipelines to automate the setup of a CI/CD of your application to Azure. Choose where to deploy your application such as Virtual Machines, App Service, Azure Kubernetes Services (AKS), Azure SQL Database, or Azure Service Fabric. + Start using Azure Pipelines to automate the setup of a CI/CD of your application to Azure. Choose where to deploy your application such as Virtual Machines, Azure App Service, Azure Kubernetes Services (AKS), Azure SQL Database, or Azure Service Fabric. To learn more, see [Overview of DevOps Starter](/azure/devops-project/overview). :::column-end::: :::row-end::: @@ -83,7 +83,7 @@ Follow the links provided in the following table to learn more about the Azure s An HTTP-based service for hosting web applications, REST APIs, and mobile back ends; the Azure App Service employs Azure Pipelines to deliver CI/CD. To learn more, see: - [App Service overview](/azure/app-service/overview) - [Deploy an Azure Web App](targets/webapp.md) - - [Deploy a web app to Azure App Services (Classic)](apps/cd/deploy-webdeploy-webapps.md) + - [Deploy a web app to Azure App Service (Classic)](apps/cd/deploy-webdeploy-webapps.md) - [Use CI/CD to deploy a Python web app to Azure App Service on Linux](ecosystems/python-webapp.md) - [Continuously deploy from a Jenkins build](release/integrate-jenkins-pipelines-cicd.md) - [Azure App Service Deploy task](tasks/deploy/azure-rm-web-app-deployment.md) diff --git a/docs/pipelines/release/define-multistage-release-process.md b/docs/pipelines/release/define-multistage-release-process.md index 758768cf78d..a65b4f011a7 100644 --- a/docs/pipelines/release/define-multistage-release-process.md +++ b/docs/pipelines/release/define-multistage-release-process.md @@ -41,7 +41,7 @@ You'll need: - [Deploy to IIS web server on Windows](../apps/cd/deploy-webdeploy-iis-deploygroups.md) * Two separate targets where you will deploy the app. These could be virtual machines, web servers, on-premises physical deployment groups, or other types of deployment target. - In this example, we are using Azure App Services website instances. If you decide to do the same, you will have to choose names that are unique, but it's a good idea to include + In this example, we are using Azure App Service website instances. If you decide to do the same, you will have to choose names that are unique, but it's a good idea to include "QA" in the name of one, and "Production" in the name of the other so that you can easily identify them. Use the Azure portal to create a new web app. ## Continuous deployment (CD) triggers diff --git a/docs/pipelines/release/deploy-iot-using-azure-pipelines.md b/docs/pipelines/release/deploy-iot-using-azure-pipelines.md index 4992d6be543..c15dcb5a727 100644 --- a/docs/pipelines/release/deploy-iot-using-azure-pipelines.md +++ b/docs/pipelines/release/deploy-iot-using-azure-pipelines.md @@ -204,6 +204,6 @@ Now that we built a Docker image and pushed it to Azure Container Registry. we m ## Related article -- [Deploy a web app to Azure App Services](../apps/cd/deploy-webdeploy-webapps.md) +- [Deploy a web app to Azure App Service](../apps/cd/deploy-webdeploy-webapps.md) - [Deploy to Azure Web App for Containers](../apps/cd/deploy-docker-webapp.md) - [Deploy a Docker container app to Azure Kubernetes Service](../apps/cd/deploy-aks.md) diff --git a/docs/pipelines/release/integrate-jenkins-pipelines-aks.md b/docs/pipelines/release/integrate-jenkins-pipelines-aks.md index 84548f3954c..62882dd1e24 100644 --- a/docs/pipelines/release/integrate-jenkins-pipelines-aks.md +++ b/docs/pipelines/release/integrate-jenkins-pipelines-aks.md @@ -372,7 +372,7 @@ The second task deploys to the AKS cluster: ## Test the CI/CD pipeline with a pull request -You can initiate the CI build and the subsequent CD deployment to Azure by completing a pull request into your main branch. The Jenkins build will initiate due to the service hook you set up earlier, and the Jenkins post build action will initiate an Azure Pipelines release which will deploy your app to the Azure App Service. +You can initiate the CI build and the subsequent CD deployment to Azure by completing a pull request into your main branch. The Jenkins build will initiate due to the service hook you set up earlier, and the Jenkins post build action will initiate an Azure Pipelines release which will deploy your app to Azure App Service. 1. Navigate to **Code** in Azure Repos, then select your **repository**. diff --git a/docs/pipelines/targets/webapp-on-container-linux.md b/docs/pipelines/targets/webapp-on-container-linux.md index 2df9195deca..05f3b8835b1 100644 --- a/docs/pipelines/targets/webapp-on-container-linux.md +++ b/docs/pipelines/targets/webapp-on-container-linux.md @@ -203,7 +203,7 @@ variables: containers: $(containerRegistry)/$(imageRepository):$(tag) ``` -The snippet assumes that the build steps in your YAML file build and push the docker image to your Azure container registry. The **Azure Web App on Container** task will pull the appropriate docker image corresponding to the BuildId from the repository specified, and then deploys the image to the Linux App Service. +The snippet assumes that the build steps in your YAML file build and push the docker image to your Azure container registry. The **Azure Web App on Container** task will pull the appropriate docker image corresponding to the BuildId from the repository specified, and then deploys the image to Azure App Service on Linux. ::: moniker-end diff --git a/docs/pipelines/tasks/deploy/azure-rm-web-app.md b/docs/pipelines/tasks/deploy/azure-rm-web-app.md index 9a7d124176a..12ba154de07 100644 --- a/docs/pipelines/tasks/deploy/azure-rm-web-app.md +++ b/docs/pipelines/tasks/deploy/azure-rm-web-app.md @@ -13,7 +13,7 @@ monikerRange: 'azure-devops' [!INCLUDE [include](../../includes/version-team-services.md)] -Use this task to deploy web applications to Azure App service. +Use this task to deploy web applications to Azure App Service. ## Arguments diff --git a/docs/pipelines/toc.yml b/docs/pipelines/toc.yml index 2c2771f612c..15a6f31dc49 100644 --- a/docs/pipelines/toc.yml +++ b/docs/pipelines/toc.yml @@ -373,9 +373,9 @@ displayName: resource manager, service connection, service principal - name: Azure App Service (Web Apps) items: - - name: Azure Web App + - name: App Service on Linux href: targets/webapp.md - - name: Azure Web App on Linux Container + - name: Custom containers with Azure App Service href: targets/webapp-on-container-linux.md - name: Visual Studio Code Deploy to Azure extension href: targets/deploy-to-azure-vscode.md