more container cleanup

ggailey777 · ggailey777 · commit 2e85a27e5d56 · 2024-07-23T18:33:23.000-07:00
diff --git a/articles/azure-functions/functions-how-to-azure-devops.md b/articles/azure-functions/functions-how-to-azure-devops.md
@@ -16,7 +16,7 @@ Use [Azure Pipelines](/azure/devops/pipelines/) to automatically deploy to Azure
 
 YAML pipelines are defined using a YAML file in your repository. A step is the smallest building block of a pipeline and can be a script or task (prepackaged script). [Learn about the key concepts and components that make up a pipeline](/azure/devops/pipelines/get-started/key-pipelines-concepts).
 
-You'll use the AzureFunctionApp task to deploy to Azure Functions. There are now two versions of the AzureFunctionApp task ([AzureFunctionApp@1](/azure/devops/pipelines/tasks/reference/azure-function-app-v1), [AzureFunctionApp@2](/azure/devops/pipelines/tasks/reference/azure-function-app-v2)). AzureFunctionApp@2 includes enhanced validation support that makes pipelines less likely to fail because of errors. 
+You'll use the `AzureFunctionApp` task to deploy to Azure Functions. There are now two versions of the AzureFunctionApp task ([AzureFunctionApp@1](/azure/devops/pipelines/tasks/reference/azure-function-app-v1), [AzureFunctionApp@2](/azure/devops/pipelines/tasks/reference/azure-function-app-v2)). `AzureFunctionApp@2` includes enhanced validation support that makes pipelines less likely to fail because of errors. 
 
 Choose your task version at the top of the article. YAML pipelines aren't available for Azure DevOps 2019 and earlier.
 
@@ -53,7 +53,6 @@ Choose your task version at the top of the article. YAML pipelines aren't availa
 
 ## Build your app
 
-
 1. Sign in to your Azure DevOps organization and navigate to your project.
 1. In your project, navigate to the **Pipelines** page. Then select **New pipeline**.
 1. Select one of these options for **Where is your code?**:
@@ -64,12 +63,11 @@ Choose your task version at the top of the article. YAML pipelines aren't availa
 1. Select **Save and run**, then select **Commit directly to the main branch**, and then choose **Save and run** again.
 1. A new run is started. Wait for the run to finish.
 
-
 ### Example YAML build pipelines
 
 The following language-specific pipelines can be used for building apps. 
 
-# [C\#](#tab/csharp)
+#### [C\#](#tab/csharp)
 
 You can use the following sample to create a YAML file to build a .NET app. 
 
@@ -102,7 +100,7 @@ steps:
     artifactName: 'drop'
 ```
 
-# [JavaScript](#tab/javascript)
+#### [JavaScript](#tab/javascript)
 
 You can use the following sample to create a YAML file to build a JavaScript app:
 
@@ -130,7 +128,7 @@ steps:
     artifactName: 'drop'
 ```
 
-# [Python](#tab/python)
+#### [Python](#tab/python)
 
 Use one of the following samples to create a YAML file to build an app for a specific Python version. Python is only supported for function apps running on Linux.
 
@@ -163,7 +161,7 @@ steps:
 
 To learn about potential issues with these pipeline tasks, see [Functions not found after deployment](recover-python-functions.md#functions-not-found-after-deployment). 
 
-# [PowerShell](#tab/powershell)
+#### [PowerShell](#tab/powershell)
 
 You can use the following sample to create a YAML file to package a PowerShell app. PowerShell is supported only for Windows Azure Functions.
 
@@ -216,12 +214,9 @@ variables:
 
 The snippet assumes that the build steps in your YAML file produce the zip archive in the `$(System.ArtifactsDirectory)` folder on your agent.
 
-
 ## Deploy a container
 
-You can automatically deploy your code to Azure Functions as a custom container after every successful build. To learn more about containers, see [Create a function on Linux using a custom container](functions-create-function-linux-custom-image.md). 
-### Deploy with the Azure Function App for Container task
-
+You can automatically deploy your code as a containerized function app after every successful build. To learn more about containers, see [Working with containers and Azure Functions](functions-how-to-custom-container.md#working-with-containers-and-azure-functions). 
 
 The simplest way to deploy to a container is to use the [Azure Function App on Container Deploy task](/azure/devops/pipelines/tasks/deploy/azure-rm-functionapp-containers).
 
@@ -251,6 +246,7 @@ variables:
 
 The snippet pushes the Docker image to your Azure Container Registry. The **Azure Function App on Container Deploy** task pulls the appropriate Docker image corresponding to the `BuildId` from the repository specified, and then deploys the image. 
 
+For a complete end-to-end pipeline example, including building the container and publishing to the container registry, see [this Azure Pipelines container deployment example](https://github.com/Azure/azure-functions-on-container-apps/blob/main/samples/AzurePipelineTasks/Func_on_ACA_DevOps_deployment.yml).
 
 ## Deploy to a slot
 
@@ -318,7 +314,7 @@ To create a build pipeline in Azure, use the `az functionapp devops-pipeline cre
 ### Example YAML build pipelines
 
 The following language-specific pipelines can be used for building apps. 
-# [C\#](#tab/csharp)
+#### [C\#](#tab/csharp)
 
 You can use the following sample to create a YAML file to build a .NET app:
 
@@ -349,7 +345,7 @@ steps:
     artifactName: 'drop'
 ```
 
-# [JavaScript](#tab/javascript)
+#### [JavaScript](#tab/javascript)
 
 You can use the following sample to create a YAML file to build a JavaScript app:
 
@@ -377,7 +373,7 @@ steps:
     artifactName: 'drop'
 ```
 
-# [Python](#tab/python)
+#### [Python](#tab/python)
 
 Use one of the following samples to create a YAML file to build an app for a specific Python version. Python is only supported for function apps running on Linux.
 
@@ -412,7 +408,7 @@ steps:
 Please check the generated archive to ensure that the deployed file has the right format. 
 To learn about potential issues with these pipeline tasks, see [Functions not found after deployment](recover-python-functions.md#functions-not-found-after-deployment). 
 
-# [PowerShell](#tab/powershell)
+#### [PowerShell](#tab/powershell)
 
 You can use the following sample to create a YAML file to package a PowerShell app. PowerShell is supported only for Windows Azure Functions.
 
diff --git a/articles/azure-functions/functions-how-to-custom-container.md b/articles/azure-functions/functions-how-to-custom-container.md
@@ -306,11 +306,24 @@ When you create a containerized function app in an environment that has workload
 
 Azure Functions lets you work with application settings for containerized function apps in the standard way. For more information, see [Use application settings](functions-how-to-use-azure-function-app-settings.md#settings).  
 
+:::zone pivot="container-apps"
+## Enable continuous deployment to Azure
+
+When you host your containerized function app on Azure Container Apps, there are two ways to set up continous deployment from a source code repository:
+
++ [Azure Pipelines](./functions-how-to-azure-devops.md#deploy-a-container)
++ [GitHub Actions](./functions-how-to-github-actions.md?tabs=container)
+
+You aren't currently able to continuously deploy containers based on image changes in a container registry. You must instead use these source-code based continuous deployment pipelines.
+
+::: zone-end
 :::zone pivot="azure-functions"
 ## Enable continuous deployment to Azure
 
 > [!IMPORTANT]
-> Webhook-based deployment isn't currently supported when running your container in an [Elastic Premium plan](functions-premium-plan.md). If you need to use the continuous deployment method described in this section, instead deploy your container in an [App Service plan](dedicated-plan.md). When running in an Elastic Premium plan, you need to manually restart your app whenever you make updates to your container in the repository.
+> Webhook-based deployment isn't currently supported when running your container in an [Elastic Premium plan](functions-premium-plan.md). If you need to use the continuous deployment method described in this section, instead deploy your container in an [App Service plan](dedicated-plan.md). When running in an Elastic Premium plan, you need to manually restart your app whenever you make updates to your container in the repository. 
+>
+> You can also configure continous deployment from a source code repository using either [Azure Pipelines](./functions-how-to-azure-devops.md#deploy-a-container) or [GitHub Actions](./functions-how-to-github-actions.md?tabs=container).
 
 You can enable Azure Functions to automatically update your deployment of an image whenever you update the image in the registry.
 
diff --git a/articles/azure-functions/functions-how-to-github-actions.md b/articles/azure-functions/functions-how-to-github-actions.md
@@ -198,7 +198,7 @@ The best way to manually create a workflow configuration is to start from the of
     
     Container deployments aren't supported on Windows. Choose Linux instead.
     
-    ### [Container](#tab/Container/linux)
+    ### [Container](#tab/container/linux)
     
     <https://github.com/Azure/actions-workflow-samples/blob/master/FunctionApp/linux-container-functionapp-on-azure.yml> 
 
