fix: Update default instance number and refactor container image parameters in Bicep files

Author: emmanuelknafo

.github/workflows/cicd.yml

@@ -34,7 +34,7 @@ permissions:
   security-events: write
 
 env:
-  DEFAULT_INSTANCE_NUMBER: "005"                # default instance number if not provided
+  DEFAULT_INSTANCE_NUMBER: "007"                # default instance number if not provided
   DEFAULT_AZURE_LOCATION: "canadacentral"       # default Azure region if not provided
   SRC_PROJECT_PATH: "/webapp01/webapp01.csproj"
   AZURE_WEBAPP_PACKAGE_PATH: "./src"            # set this to the path to your web app project, defaults to the repository root
@@ -74,7 +74,7 @@ jobs:
           $appServicePlanName = "asp-gh-aspnet-webapp-$instanceNumber"
           $webAppName = "app-gh-aspnet-webapp-$instanceNumber"
           $resourceGroupName = "rg-gh-aspnet-webapp-$instanceNumber"
-          $containerImage = "$acrName.azurecr.io/webapp01:latest"
+          $containerImageName = "webapp01:latest"
 
           # Deployment name based only on instance number for idempotence
           $deploymentName = "deploy-infra-$instanceNumber"
@@ -98,7 +98,7 @@ jobs:
             --parameters appServicePlanName=$appServicePlanName `
             --parameters webAppName=$webAppName `
             --parameters location=$location `
-            --parameters containerImage=$containerImage `
+            --parameters containerImageName=$containerImageName `
             --parameters resourceGroupName=$resourceGroupName `
             --query "properties.outputs" -o json
 

blueprints/gh-aspnet-webapp/bicep/main.bicep

@@ -15,8 +15,8 @@ param webAppName string
 @description('The location for all resources')
 param location string
 
-@description('The container image to deploy')
-param containerImage string
+@description('The container image name without registry prefix (e.g., webapp01:latest)')
+param containerImageName string = 'webapp01:latest'
 
 @description('The name of the Resource Group')
 param resourceGroupName string = 'rg-webapp01-dev'
@@ -42,7 +42,7 @@ module resourcesInRG './resources.bicep' = {
     appServicePlanName: '${appServicePlanName}-${uniqueSuffix}'
     webAppName: '${webAppName}-${uniqueSuffix}'
     location: location
-    containerImage: containerImage
+    containerImageName: containerImageName
   }
 }
 

blueprints/gh-aspnet-webapp/bicep/resources.bicep

@@ -13,8 +13,8 @@ param webAppName string
 @description('The location for all resources')
 param location string
 
-@description('The container image to deploy')
-param containerImage string
+@description('The container image name without registry prefix (e.g., webapp01:latest)')
+param containerImageName string = 'webapp01:latest'
 
 // Deploy the Azure Container Registry
 resource acr 'Microsoft.ContainerRegistry/registries@2023-01-01-preview' = {
@@ -58,18 +58,18 @@ resource webApp 'Microsoft.Web/sites@2024-04-01' = {
       appSettings: [
         {
           name: 'DOCKER_REGISTRY_SERVER_URL'
-          value: 'https://${acr.name}.azurecr.io'
+          value: 'https://${acr.properties.loginServer}'
         }
         {
           name: 'WEBSITES_ENABLE_APP_SERVICE_STORAGE'
           value: 'false'
         }
         {
           name: 'DOCKER_CUSTOM_IMAGE_NAME'
-          value: containerImage
+          value: '${acr.properties.loginServer}/${containerImageName}'
         }
       ]
-      linuxFxVersion: 'DOCKER|${containerImage}' // Specify the container image
+      linuxFxVersion: 'DOCKER|${acr.properties.loginServer}/${containerImageName}'
     }
   }
 }