Skip to content

Commit 16ce5a5

Browse files
Merge pull request #331 from microsoft/dev
fix: merging dev changes to main
2 parents 0ff3402 + 160439d commit 16ce5a5

File tree

18 files changed

+18943
-13207
lines changed

18 files changed

+18943
-13207
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ jobs:
146146
--parameters \
147147
solutionName="${{ env.ENVIRONMENT_NAME }}" \
148148
enablePrivateNetworking="false" \
149-
secondaryLocation="eastus2" \
150149
contentUnderstandingLocation="WestUS" \
151150
deploymentType="GlobalStandard" \
152151
gptModelName="gpt-4o" \
153152
gptModelVersion="2024-08-06" \
154153
gptDeploymentCapacity="30" \
155154
aiServiceLocation="${{ env.AZURE_LOCATION }}" \
155+
imageTag="latest" \
156156
tags="{'CreatedBy':'Pipeline', 'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
157157
--query "properties.outputs" -o json); then
158158
echo "❌ Deployment failed. See logs above."

docs/CustomizingAzdParameters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ By default this template will use the environment name as the prefix to prevent
1717
| `AZURE_ENV_MODEL_VERSION` | string | `2024-08-06` | Specifies the GPT model version (allowed values: `2024-08-06`). |
1818
| `AZURE_ENV_MODEL_CAPACITY` | integer | `30` | Sets the model capacity (choose based on your subscription's available GPT capacity). |
1919
| `AZURE_ENV_IMAGETAG` | boolean | `latest` | Set the Image tag Like (allowed values: latest, dev, hotfix) |
20-
| `AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT` | string | `cpscontainerreg.azurecr.io` | Sets the Azure Container Registry name (allowed value: `cpscontainerreg.azurecr.io`) |
20+
| `AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT` | string | `cpscontainerreg.azurecr.io` | Sets the Azure Container Registry name (allowed value: `cpscontainerreg.azurecr.io`) | |
2121
| `AZURE_ENV_CONTAINER_IMAGE_TAG` | string | `latest` | Sets the container image tag (e.g., `latest`, `dev`, `hotfix`). |
2222
| `AZURE_LOCATION` | string | `eastus` | Sets the primary Azure region for resource deployment. |
2323
| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string | Guide to get your [Existing Workspace ID](/docs/re-use-log-analytics.md) | Reuses an existing Log Analytics Workspace instead of provisioning a new one. |

0 commit comments

Comments
 (0)