Test build 01

Author: RoseHJM

articles/deployment-environments/concept-extensibility-model.md

@@ -48,6 +48,18 @@ For instructions, see: [Create a custom container image manually](https://aka.ms
 
 ### Terraform
 
+**Create a custom image using a script**
+
+To make the process of building a custom image and pushing it to a container registry easier, Microsoft provides a script that builds and pushes the image to a registry that you specify. 
+
+For instructions, see: [Create a custom container image by using a script](https://aka.ms/ade/arm-bicep-custom-script).
+
+**Create a custom image using a GitHub workflow**
+
+To make the process of building a custom image and pushing it to a container registry easier, Microsoft provides a script that builds and pushes the image to a registry that you specify. 
+
+For instructions, see: [Create a custom container image by using a script](https://aka.ms/ade/arm-bicep-custom-script).
+
 **Create a Terraform specific container image manually**
 
 You can use a GitHub workflow to create a custom Terraform image that includes the software, settings, and other customizations you need for your Terraform specific image. You can then upload the new image to a container registry and use it by referencing it in the environment.yaml file.

articles/deployment-environments/how-to-configure-extensibility-model-custom-image.md

@@ -69,9 +69,19 @@ For more information about how to create environment definitions that use the AD
 ### [Create a custom image by using a script](#tab/custom-script/)
 ### Create a custom container image by using a script
 
-Creating a custom container image allows you to customize your deployments to fit your requirements. You can build an image based on the ADE standard image and push it to your container registry by using a quick start script provided by Microsoft. You can find the script in the [Deployment Environments repo](https://aka.ms/ade/arm-bicep-repo-script). To use the quick start script, fork the repo and then run the script locally.
+Creating a custom container image allows you to customize your deployments to fit your requirements. You can create and build an image based on the ADE standard image and push it to your container registry by using a quick start script provided by Microsoft. You can find the script in the [Deployment Environments repo](https://aka.ms/ade/arm-bicep-repo-script). To use the quick start script, fork the repo and then run the script locally.
 
-The script builds an image and pushes it to the specified Azure Container Registry (ACR) under the repository 'ade' and the tag 'latest'. This script requires your registry name and directory for your custom image, have the Azure CLI and Docker Desktop installed and in your PATH variables, and requires that you have permissions to push to the specified registry. You can call the script using the following command in PowerShell:
+The script builds an image and pushes it to the specified Azure Container Registry (ACR) under the repository 'ade' and the tag 'latest'. This script requires your registry name and directory for your custom image, have the Azure CLI and Docker Desktop installed and in your PATH variables, and requires that you have permissions to push to the specified registry. 
+
+To use the script, you must:
+
+1. Create a Dockerfile and scripts folder to support the ADE extensibility model. 
+1. Supply a registry name and directory for your custom image.
+1. Have the Azure CLI and Docker Desktop installed and in your PATH variables.
+1. Have Docker Desktop running.
+1. Have permissions to push to the specified registry.
+
+You can call the script using the following command in PowerShell:
 
 ```azurepowershell
 .\quickstart-image-build.ps1 -Registry '{YOUR_REGISTRY}' -Directory '{DIRECTORY_TO_YOUR_IMAGE}'
@@ -85,12 +95,6 @@ Additionally, if you would like to push to a specific repository and tag name, y
 
 To use the image in your environment deployments, you need to add the location of the image to your manifest file [Connect the image to your environment definition](#connect-the-image-to-your-environment-definition) and you might need to configure permissions for the ACR to [make the custom image available to ADE](#make-the-custom-image-available-to-ade).
 
-### Build a container image with a script
-
-Rather than building your custom image and pushing it to a container registry yourself, you can use a script to build and push it to a specified container registry. 
-
-[!INCLUDE [custom-image-script](includes/custom-image-script-build.md)]
-
 ### [Create a custom image manually](#tab/custom-manual/)
 ### Create a custom container image manually
 
@@ -115,17 +119,24 @@ After you complete the image customization, you can build the image and push it
 ## Use container images with ADE
 
 You can take one of the following approaches to use container images with ADE:
-- **Create a container image leveraging a GitHub workflow:** To start with, you can use the published GitHub workflow from the Leveraging ADE's Extensibility Model With Terraform repository.
-- **Create a custom container image:** You can create a workflow that creates a Terraform specific image customized with all the software, settings, and configuration that you need.
+- **Create a custom container image by using a script:** Use the published script to create a Terraform specific image.
+- **Create a container image leveraging a GitHub workflow:** Use the published GitHub workflow from the Leveraging ADE's Extensibility Model With Terraform repository.
+- **Create a custom container image manually:** Create a customized Terraform specific image manually
 
 ## Create a custom container image
 
-### [Create a container image using a GitHub workflow](#tab/github-workflow/)
+### [Create a container image using a script](#tab/terraform-script/)
 
-### Create a container image using a GitHub workflow
+### Create a container image using a script
 
 Creating a custom container image allows you to customize your deployments to fit your requirements. You can build an image based on the ADE standard image and push it to your container registry by using a quick start script provided by Microsoft. You can find the script in the [Deployment Environments with Terraform repo](https://aka.ms/ade/terraform-repo-script). To use the quick start script, fork the repo and then run the script locally.
 
+To use the quickstart script to quickly build and push this sample image to an Azure Container Registry, you will need to:
+
+- Fork this repository into your personal account.
+- Ensure the Azure CLI and the Docker Desktop application are installed on your computer and within your PATH variables.
+- Ensure you have permissions to push images to your selected Azure Container Registry.
+
 The script builds an image and pushes it to the specified Azure Container Registry (ACR) under the repository 'ade' and the tag 'latest'. This script requires your registry name and directory for your custom image, have the Azure CLI and Docker Desktop installed and in your PATH variables, and requires that you have permissions to push to the specified registry. You can call the script using the following command in PowerShell:
 
 ```azurepowershell
@@ -140,6 +151,22 @@ Additionally, if you would like to push to a specific repository and tag name, y
 
 To use the image in your environment deployments, you need to add the location of the image to your manifest file [Connect the image to your environment definition](#connect-the-image-to-your-environment-definition) and you might need to configure permissions for the ACR to [make the custom image available to ADE](#make-the-custom-image-available-to-ade).
 
+### [Create a container image using a GitHub workflow](#tab/github-workflow/)
+
+## Create a container image by by using a GitHub workflow
+
+To start with, you can use the published GitHub workflow from the Leveraging ADE's Extensibility Model With Terraform repository.
+
+In order to use the workflow, you will need to:
+
+- Fork this repository into your personal account
+- Allow GitHub Actions to connect to Azure via an Microsoft Entra ID application's federated credentials through OIDC. You can find more documentation about this process here
+- Set up Repository Secrets for your repository containing your Microsoft Entra ID application's application ID set as AZURE_CLIENT_ID, the subscription ID set as AZURE_SUBSCRIPTION_ID, and the tenant ID set as AZURE_TENANT_ID
+- Set up Repository Variables for your repository containing your personal Azure Container Registry (ACR) name as REGISTRY_NAME, your preferred repository name as REPOSITORY_NAME, and your preferred tag as TAG for the created image. You can modify your variables between workflow runs to push the generated image to different registries, repositories and tags.
+ 
+Run the workflow by navigating to the Actions tab in your forked repository and selecting the workflow you would like to run. You can then select the Run workflow button to start the workflow.
+
+To use the image in your environment deployments, you need to add the location of the image to your manifest file [Connect the image to your environment definition](#connect-the-image-to-your-environment-definition) and you might need to configure permissions for the ACR to [make the custom image available to ADE](#make-the-custom-image-available-to-ade).
 
 ### Create a container image manually