fix: Resolve merge conflict - updates the container image tags for both backend and frontend deployments#810
Merged
Avijit-Microsoft merged 4 commits intodevfrom Mar 13, 2026
Merged
Conversation
Avijit-Microsoft
approved these changes
Mar 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
backendContainerImageTagandfrontendContainerImageTagparameters ininfra/main.bicepand their default values ininfra/main.jsonto use the new taglatest_afv2_2026-03-10_1326instead oflatest_waf_2025-12-02_1084. [1] [2] [3] [4]ARM template dependency ordering:
infra/main.jsonso thatopenAIandcognitiveServicesDNS zones are listed afteraiServices, ensuring correct provisioning order.infra/main.jsonso thatstorageQueueDNS zone is listed afterstorageBlobandstorageFile, ensuring correct provisioning order.Other infrastructure changes:
templateHashininfra/main.jsonto reflect the new template version.Does this introduce a breaking change?