refactor: update environment variable names to use AZURE_ENV prefix

Author: Pavan-Microsoft

azure_custom.yaml

@@ -35,13 +35,13 @@ hooks:
         Write-Host "Preparing deployment..." -ForegroundColor Cyan
         
         # Check if this is first run (ACR doesn't exist yet)
-        # Set IMAGE_TAG='none' to skip ACI deployment until image is built
-        $currentTag = azd env get-value IMAGE_TAG 2>$null
+        # Set AZURE_ENV_IMAGE_TAG='none' to skip ACI deployment until image is built
+        $currentTag = azd env get-value AZURE_ENV_IMAGE_TAG 2>$null
         $global:LASTEXITCODE = 0
         
-        if (-not $env:AZURE_CONTAINER_REGISTRY_NAME -and $currentTag -ne 'latest') {
+        if (-not $env:AZURE_ENV_CONTAINER_REGISTRY_NAME -and $currentTag -ne 'latest') {
           Write-Host "First deployment - ACI will be deployed after image build" -ForegroundColor Yellow
-          azd env set IMAGE_TAG none
+          azd env set AZURE_ENV_IMAGE_TAG none
         }
       continueOnError: false
     posix:
@@ -50,19 +50,19 @@ hooks:
         echo "Preparing deployment..."
         
         # Check if this is first run (ACR doesn't exist yet)
-        current_tag=$(azd env get-value IMAGE_TAG 2>/dev/null || echo "")
+        current_tag=$(azd env get-value AZURE_ENV_IMAGE_TAG 2>/dev/null || echo "")
         
-        if [ -z "$AZURE_CONTAINER_REGISTRY_NAME" ] && [ "$current_tag" != "latest" ]; then
+        if [ -z "$AZURE_ENV_CONTAINER_REGISTRY_NAME" ] && [ "$current_tag" != "latest" ]; then
           echo "First deployment - ACI will be deployed after image build"
-          azd env set IMAGE_TAG none
+          azd env set AZURE_ENV_IMAGE_TAG none
         fi
       continueOnError: false
 
   postprovision:
     windows:
       shell: pwsh
       run: |
-        $acrName = $env:AZURE_CONTAINER_REGISTRY_NAME
+        $acrName = $env:AZURE_ENV_CONTAINER_REGISTRY_NAME
         $resourceGroup = $env:RESOURCE_GROUP_NAME
         $backendImage = $env:BACKEND_IMAGE_NAME
         $appServiceName = $env:APP_SERVICE_NAME
@@ -94,7 +94,7 @@ hooks:
         if (-not $aciName) {
           Write-Host ""
           Write-Host "===== Deploying Container Instance =====" -ForegroundColor Yellow
-          azd env set IMAGE_TAG latest
+          azd env set AZURE_ENV_IMAGE_TAG latest
           
           # Use az deployment instead of azd provision to avoid hook recursion
           # Pass parameters inline (main.parameters.json uses AZD ${VAR} syntax not supported by az CLI)
@@ -132,7 +132,7 @@ hooks:
     posix:
       shell: sh
       run: |
-        ACR_NAME="$AZURE_CONTAINER_REGISTRY_NAME"
+        ACR_NAME="$AZURE_ENV_CONTAINER_REGISTRY_NAME"
         RESOURCE_GROUP="$RESOURCE_GROUP_NAME"
         BACKEND_IMAGE="$BACKEND_IMAGE_NAME"
         APP_SERVICE="$APP_SERVICE_NAME"
@@ -162,7 +162,7 @@ hooks:
         if [ -z "$ACI_NAME" ]; then
           echo ""
           echo "===== Deploying Container Instance ====="
-          azd env set IMAGE_TAG latest
+          azd env set AZURE_ENV_IMAGE_TAG latest
           
           # Use az deployment instead of azd provision to avoid hook recursion
           # Pass parameters inline (main.parameters.json uses AZD ${VAR} syntax not supported by az CLI)

infra/main_custom.bicep

@@ -1059,10 +1059,10 @@ resource containerInstance 'Microsoft.ContainerInstance/containerGroups@2025-09-
           environmentVariables: [
             // Azure OpenAI Settings
             { name: 'AZURE_OPENAI_ENDPOINT', value: 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/' }
-            { name: 'AZURE_OPENAI_GPT_MODEL', value: gptModelName }
-            { name: 'AZURE_OPENAI_IMAGE_MODEL', value: imageModelConfig[imageModelChoice].name }
+            { name: 'AZURE_ENV_GPT_MODEL_NAME', value: gptModelName }
+            { name: 'AZURE_ENV_IMAGE_MODEL_NAME', value: imageModelConfig[imageModelChoice].name }
             { name: 'AZURE_OPENAI_GPT_IMAGE_ENDPOINT', value: imageModelChoice != 'none' ? 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/' : '' }
-            { name: 'AZURE_OPENAI_API_VERSION', value: azureOpenaiAPIVersion }
+            { name: 'AZURE_ENV_OPENAI_API_VERSION', value: azureOpenaiAPIVersion }
             // Azure Cosmos DB Settings
             { name: 'AZURE_COSMOS_ENDPOINT', value: 'https://cosmos-${solutionSuffix}.documents.azure.com:443/' }
             { name: 'AZURE_COSMOS_DATABASE_NAME', value: cosmosDBDatabaseName }
@@ -1167,7 +1167,7 @@ output AI_FOUNDRY_RG_NAME string = aiFoundryAiServicesResourceGroupName
 output AI_FOUNDRY_RESOURCE_ID string = useExistingAiFoundryAiProject ? '' : aiFoundryAiServices!.outputs.resourceId
 
 @description('Contains existing AI project resource ID.')
-output AZURE_EXISTING_AI_PROJECT_RESOURCE_ID string = azureExistingAIProjectResourceId
+output AZURE_EXISTING_AIPROJECT_RESOURCE_ID string = azureExistingAIProjectResourceId
 
 @description('Contains AI Search Service Endpoint URL')
 output AZURE_AI_SEARCH_ENDPOINT string = 'https://${aiSearch.outputs.name}.search.windows.net/'
@@ -1185,16 +1185,16 @@ output AZURE_AI_SEARCH_IMAGE_INDEX string = 'product-images'
 output AZURE_OPENAI_ENDPOINT string = 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/'
 
 @description('Contains GPT Model')
-output AZURE_OPENAI_GPT_MODEL string = gptModelName
+output AZURE_ENV_GPT_MODEL_NAME string = gptModelName
 
 @description('Contains Image Model (empty if none selected)')
-output AZURE_OPENAI_IMAGE_MODEL string = imageModelConfig[imageModelChoice].name
+output AZURE_ENV_IMAGE_MODEL_NAME string = imageModelConfig[imageModelChoice].name
 
 @description('Contains Azure OpenAI GPT/Image endpoint URL (empty if no image model selected)')
 output AZURE_OPENAI_GPT_IMAGE_ENDPOINT string = imageModelChoice != 'none' ? 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/' : ''
 
 @description('Contains Azure OpenAI API Version')
-output AZURE_OPENAI_API_VERSION string = azureOpenaiAPIVersion
+output AZURE_ENV_OPENAI_API_VERSION string = azureOpenaiAPIVersion
 
 @description('Contains OpenAI Resource')
 output AZURE_OPENAI_RESOURCE string = aiFoundryAiServicesResourceName
@@ -1221,13 +1221,7 @@ output CONTAINER_INSTANCE_IP string = shouldDeployACI ? containerInstance!.prope
 output CONTAINER_INSTANCE_FQDN string = (shouldDeployACI && !isPrivateNetworking) ? containerInstance!.properties.ipAddress.fqdn : ''
 
 @description('Contains ACR Name')
-output ACR_NAME string = acrResourceName
-
-@description('Contains Azure Container Registry Endpoint (used by AZD for remote builds)')
-output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.outputs.loginServer
-
-@description('Contains Azure Container Registry Name')
-output AZURE_CONTAINER_REGISTRY_NAME string = containerRegistry.outputs.name
+output AZURE_ENV_CONTAINER_REGISTRY_NAME string = containerRegistry.outputs.name
 
 @description('Contains flag for Azure AI Foundry usage')
 output USE_FOUNDRY bool = useFoundryMode ? true : false
@@ -1251,4 +1245,4 @@ output FRONTEND_IMAGE_NAME string = frontendImageName
 output BACKEND_IMAGE_NAME string = backendImageName
 
 @description('Image tag')
-output IMAGE_TAG string = imageTag
+output AZURE_ENV_IMAGE_TAG string = imageTag