Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/CAdeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ jobs:
id: determine_tag
run: |
BRANCH=${{ github.ref_name }}
if [[ "$BRANCH" == "main" ]]; then TAG="latest"
if [[ "$BRANCH" == "main" ]]; then TAG="latest_waf"
elif [[ "$BRANCH" == "dev" ]]; then TAG="dev"
elif [[ "$BRANCH" == "demo" ]]; then TAG="demo"
else TAG="latest"; fi
else TAG="latest_waf"; fi
echo "IMAGE_TAG=$TAG" >> $GITHUB_ENV
echo "Image Tag: $TAG"
- name: Deploy and extract values from deployment output
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
id: determine_tag
run: |
if [[ "${{ github.ref_name }}" == "main" ]]; then
echo "tagname=latest" >> $GITHUB_OUTPUT
echo "tagname=latest_waf" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
echo "tagname=dev" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "demo" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion docs/CustomizingAzdParameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ By default this template will use the environment name as the prefix to prevent
| `AZURE_ENV_MODEL_CAPACITY` | integer | `30` | Set the model capacity for GPT deployment. Choose based on your Azure quota and usage needs. |
| `AZURE_ENV_EMBEDDING_MODEL_NAME` | string | `text-embedding-ada-002` | Set the model name used for embeddings. |
| `AZURE_ENV_EMBEDDING_MODEL_CAPACITY` | integer | `80` | Set the capacity for embedding model deployment. |
| `AZURE_ENV_IMAGETAG` | string | `latest` | Set the image tag (allowed values: `latest`, `dev`, `hotfix`). |
| `AZURE_ENV_IMAGETAG` | string | `latest_waf` | Set the image tag (allowed values: `latest_waf`, `dev`, `hotfix`). |
| `AZURE_LOCATION` | string | `<User selects during deployment>` | Sets the Azure region for resource deployment. |
| `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. |
| `AZURE_EXISTING_AI_PROJECT_RESOURCE_ID` | string | `<Existing AI Foundry Project Resource Id>` | Reuses an existing AI Foundry Project Resource Id instead of provisioning a new one. |
Expand Down
2 changes: 1 addition & 1 deletion docs/DeploymentGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ When you start the deployment, most parameters will have **default values**, but
| **GPT Model Deployment Capacity** | Configure capacity for **GPT models**. Choose based on Azure OpenAI quota. | `30` |
| **Embedding Model** | OpenAI embedding model used for vector similarity. | `text-embedding-ada-002` |
| **Embedding Model Capacity** | Set the capacity for **embedding models**. Choose based on usage and quota. | `80` |
| **Image Tag** | The version of the Docker image to use (e.g., `latest`, `dev`, `hotfix`). | `latest` |
| **Image Tag** | The version of the Docker image to use (e.g., `latest_waf`, `dev`, `hotfix`). | `latest_waf` |
| **Azure OpenAI API Version** | Set the API version for OpenAI model deployments. | `2025-04-01-preview` |
| **AZURE_LOCATION** | Sets the Azure region for resource deployment. | `<User selects during deployment>` |
| **Existing Log Analytics Workspace** | To reuse an existing Log Analytics Workspace ID instead of creating a new one. | *(empty)* |
Expand Down
2 changes: 1 addition & 1 deletion infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ param containerRegistryHostname string = 'bycwacontainerreg.azurecr.io'
param containerImageName string = 'byc-wa-app'

@description('Optional. The Container Image Tag to deploy on the webapp.')
param containerImageTag string = 'latest'
param containerImageTag string = 'latest_waf'

@description('Optional. Resource ID of an existing Foundry project')
param existingFoundryProjectResourceId string = ''
Expand Down
118 changes: 26 additions & 92 deletions infra/main.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions infra/main.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"value": "${AZURE_ENV_EMBEDDING_MODEL_CAPACITY}"
},
"imageTag": {
"value": "${AZURE_ENV_IMAGETAG}"
"value": "${AZURE_ENV_IMAGETAG=latest_waf}"
},
"location": {
"value": "${AZURE_LOCATION}"
Expand All @@ -44,4 +44,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions infra/main.waf.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"value": "${AZURE_ENV_EMBEDDING_MODEL_CAPACITY}"
},
"imageTag": {
"value": "${AZURE_ENV_IMAGETAG}"
"value": "${AZURE_ENV_IMAGETAG=latest_waf}"
},
"location": {
"value": "${AZURE_LOCATION}"
Expand Down Expand Up @@ -62,4 +62,4 @@
"value": "${AZURE_ENV_VM_ADMIN_PASSWORD}"
}
}
}
}