Skip to content

Commit 9d253b5

Browse files
fix: standardize imageTag env variable naming to AZURE_ENV_IMAGE_TAG
Rename AZURE_ENV_IMAGETAG to AZURE_ENV_IMAGE_TAG across all files: - infra/main.parameters.json - infra/main.waf.parameters.json - infra/main.bicep (default remains latest_v2) - infra/scripts/docker-build.sh - infra/scripts/docker-build.ps1 - .github/workflows/job-deploy-linux.yml - .github/workflows/job-deploy-windows.yml - docs/CustomizingAzdParameters.md Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 8494f46 commit 9d253b5

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/job-deploy-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ jobs:
242242
azd env set AZURE_ENV_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
243243
azd env set AZURE_LOCATION="$AZURE_LOCATION"
244244
azd env set AZURE_RESOURCE_GROUP="$RESOURCE_GROUP_NAME"
245-
azd env set AZURE_ENV_IMAGETAG="$IMAGE_TAG"
245+
azd env set AZURE_ENV_IMAGE_TAG="$IMAGE_TAG"
246246
247247
if [[ "$BUILD_DOCKER_IMAGE" == "true" ]]; then
248248
ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}")

.github/workflows/job-deploy-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ jobs:
239239
azd env set AZURE_ENV_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
240240
azd env set AZURE_LOCATION="$env:AZURE_LOCATION"
241241
azd env set AZURE_RESOURCE_GROUP="$env:RESOURCE_GROUP_NAME"
242-
azd env set AZURE_ENV_IMAGETAG="$env:IMAGE_TAG"
242+
azd env set AZURE_ENV_IMAGE_TAG="$env:IMAGE_TAG"
243243
244244
# Set ACR name only when building Docker image
245245
if ($env:BUILD_DOCKER_IMAGE -eq "true") {

docs/CustomizingAzdParameters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ By default this template will use the environment name as the prefix to prevent
1818
| `AZURE_ENV_GPT_MODEL_VERSION` | string | `2025-11-13` | Specifies the GPT model version. |
1919
| `AZURE_ENV_GPT_MODEL_CAPACITY` | integer | `300` | Sets the model capacity (minimum 1). Default: 300. Optimal: 500 for multi-document claim processing. |
2020
| `AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT` | string | `cpscontainerreg.azurecr.io` | Sets the public container image endpoint for pulling pre-built images. |
21-
| `AZURE_ENV_IMAGETAG` | string | `latest_v2` | Sets the container image tag (e.g., `latest_v2`, `dev`, `demo`, `hotfix`). |
21+
| `AZURE_ENV_IMAGE_TAG` | string | `latest_v2` | Sets the container image tag (e.g., `latest_v2`, `dev`, `demo`, `hotfix`). |
2222
| `AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID` | string | Guide to get your [Existing Workspace Resource ID](/docs/re-use-log-analytics.md) | Reuses an existing Log Analytics Workspace instead of provisioning a new one. |
2323
| `AZURE_EXISTING_AIPROJECT_RESOURCE_ID` | string | Guide to get your [Existing AI Project Resource ID](/docs/re-use-foundry-project.md) | Reuses an existing AI Foundry and AI Foundry Project instead of creating a new one. |
2424
| `AZURE_ENV_VM_SIZE` | string | `Standard_D2s_v5` | Overrides the jumpbox VM size (private networking only). Default: `Standard_D2s_v5`. |

infra/main.parameters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"value": "${AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT}"
3737
},
3838
"imageTag": {
39-
"value": "${AZURE_ENV_IMAGETAG=latest_v2}"
39+
"value": "${AZURE_ENV_IMAGE_TAG=latest_v2}"
4040
}
4141
}
4242
}

infra/main.waf.parameters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"value": "${AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT}"
5555
},
5656
"imageTag": {
57-
"value": "${AZURE_ENV_IMAGETAG=latest_v2}"
57+
"value": "${AZURE_ENV_IMAGE_TAG=latest_v2}"
5858
}
5959
}
6060
}

infra/scripts/docker-build.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function Build-And-Push-Image {
2020
[string]$CONTAINER_APP_NAME
2121
)
2222

23-
$IMAGE_URI = "$ACR_NAME.azurecr.io/$($IMAGE_NAME):$AZURE_ENV_IMAGETAG"
23+
$IMAGE_URI = "$ACR_NAME.azurecr.io/$($IMAGE_NAME):$AZURE_ENV_IMAGE_TAG"
2424

2525
Write-Host "Building Docker image: $IMAGE_URI"
2626
docker build $BUILD_PATH --no-cache -t $IMAGE_URI
@@ -103,7 +103,7 @@ $ENV_NAME = Get-AzdEnvValueOrDefault -KeyName "AZURE_ENV_NAME" -Required $true
103103
$CONTAINER_APP_USER_IDENTITY_ID = Get-AzdEnvValueOrDefault -KeyName "CONTAINER_APP_USER_IDENTITY_ID" -Required $true
104104
$AZURE_RESOURCE_GROUP = Get-AzdEnvValueOrDefault -KeyName "AZURE_RESOURCE_GROUP" -Required $true
105105
$CONTAINER_APP_USER_PRINCIPAL_ID = Get-AzdEnvValueOrDefault -KeyName "CONTAINER_APP_USER_PRINCIPAL_ID" -Required $true
106-
$AZURE_ENV_IMAGETAG = Get-AzdEnvValueOrDefault -KeyName "AZURE_ENV_IMAGETAG" -DefaultValue "latest_v2"
106+
$AZURE_ENV_IMAGE_TAG = Get-AzdEnvValueOrDefault -KeyName "AZURE_ENV_IMAGE_TAG" -DefaultValue "latest_v2"
107107
$CONTAINER_WEB_APP_NAME=Get-AzdEnvValueOrDefault -KeyName "CONTAINER_WEB_APP_NAME" -Required $true
108108
$CONTAINER_API_APP_NAME=Get-AzdEnvValueOrDefault -KeyName "CONTAINER_API_APP_NAME" -Required $true
109109
$CONTAINER_APP_NAME=Get-AzdEnvValueOrDefault -KeyName "CONTAINER_APP_NAME" -Required $true
@@ -116,7 +116,7 @@ Write-Host "Using the following parameters:"
116116
Write-Host "AZURE_SUBSCRIPTION_ID = $AZURE_SUBSCRIPTION_ID"
117117
Write-Host "ENV_NAME = $ENV_NAME"
118118
Write-Host "AZURE_RESOURCE_GROUP = $AZURE_RESOURCE_GROUP"
119-
Write-Host "AZURE_ENV_IMAGETAG = $AZURE_ENV_IMAGETAG"
119+
Write-Host "AZURE_ENV_IMAGE_TAG = $AZURE_ENV_IMAGE_TAG"
120120

121121
Ensure-AzLogin
122122

infra/scripts/docker-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ENV_NAME=$(get_azd_env_value_or_default "AZURE_ENV_NAME" "" true)
3636
CONTAINER_APP_USER_IDENTITY_ID=$(get_azd_env_value_or_default "CONTAINER_APP_USER_IDENTITY_ID" "" true)
3737
AZURE_RESOURCE_GROUP=$(get_azd_env_value_or_default "AZURE_RESOURCE_GROUP" "" true)
3838
CONTAINER_APP_USER_PRINCIPAL_ID=$(get_azd_env_value_or_default "CONTAINER_APP_USER_PRINCIPAL_ID" "" true)
39-
AZURE_ENV_IMAGETAG=$(get_azd_env_value_or_default "AZURE_ENV_IMAGETAG" "latest_v2" false)
39+
AZURE_ENV_IMAGE_TAG=$(get_azd_env_value_or_default "AZURE_ENV_IMAGE_TAG" "latest_v2" false)
4040
CONTAINER_WEB_APP_NAME=$(get_azd_env_value_or_default "CONTAINER_WEB_APP_NAME" "" true)
4141
CONTAINER_API_APP_NAME=$(get_azd_env_value_or_default "CONTAINER_API_APP_NAME" "" true)
4242
CONTAINER_APP_NAME=$(get_azd_env_value_or_default "CONTAINER_APP_NAME" "" true)
@@ -48,7 +48,7 @@ echo "Using the following parameters:"
4848
echo "AZURE_SUBSCRIPTION_ID = $AZURE_SUBSCRIPTION_ID"
4949
echo "ENV_NAME = $ENV_NAME"
5050
echo "AZURE_RESOURCE_GROUP = $AZURE_RESOURCE_GROUP"
51-
echo "AZURE_ENV_IMAGETAG = $AZURE_ENV_IMAGETAG"
51+
echo "AZURE_ENV_IMAGE_TAG = $AZURE_ENV_IMAGE_TAG"
5252

5353
# Ensure Azure login
5454
echo "Checking Azure login status..."
@@ -85,7 +85,7 @@ build_and_push_image() {
8585
BUILD_PATH="$2"
8686
CONTAINER_APP="$3"
8787

88-
IMAGE_URI="$ACR_NAME.azurecr.io/$IMAGE_NAME:$AZURE_ENV_IMAGETAG"
88+
IMAGE_URI="$ACR_NAME.azurecr.io/$IMAGE_NAME:$AZURE_ENV_IMAGE_TAG"
8989
echo "Building image: $IMAGE_URI"
9090
docker build "$BUILD_PATH" --no-cache -t "$IMAGE_URI"
9191

0 commit comments

Comments
 (0)