Skip to content

fix: Resolve merge conflict - updates the container image tags for both backend and frontend deployments#810

Merged
Avijit-Microsoft merged 4 commits intodevfrom
psl-pk-resolveconflict
Mar 13, 2026
Merged

fix: Resolve merge conflict - updates the container image tags for both backend and frontend deployments#810
Avijit-Microsoft merged 4 commits intodevfrom
psl-pk-resolveconflict

Conversation

@Pavan-Microsoft
Copy link
Contributor

Purpose

This pull request updates the container image tags for both backend and frontend deployments in the infrastructure configuration, and also reorders some resource dependencies in the generated ARM template. The primary goal is to deploy newer container versions and ensure proper resource dependency ordering.

Container image updates:

  • Updated backendContainerImageTag and frontendContainerImageTag parameters in infra/main.bicep and their default values in infra/main.json to use the new tag latest_afv2_2026-03-10_1326 instead of latest_waf_2025-12-02_1084. [1] [2] [3] [4]

ARM template dependency ordering:

  • Reordered dependencies in infra/main.json so that openAI and cognitiveServices DNS zones are listed after aiServices, ensuring correct provisioning order.
  • Reordered dependencies in infra/main.json so that storageQueue DNS zone is listed after storageBlob and storageFile, ensuring correct provisioning order.

Other infrastructure changes:

  • Updated the templateHash in infra/main.json to reflect the new template version.

Does this introduce a breaking change?

  • Yes
  • No

@Avijit-Microsoft Avijit-Microsoft merged commit 93bc48f into dev Mar 13, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants