From 106f1232010a06eeefd852104a0d5cb5dd0123da Mon Sep 17 00:00:00 2001 From: M Mohana Satyanarayana <53141911+Dead-Stone@users.noreply.github.com> Date: Mon, 22 Jul 2024 22:56:57 -0700 Subject: [PATCH] Update deploy.sh (#88) Co-authored-by: Josh Bradley --- infra/deploy.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/infra/deploy.sh b/infra/deploy.sh index 57d6c6f..2720208 100755 --- a/infra/deploy.sh +++ b/infra/deploy.sh @@ -509,21 +509,22 @@ grantDevAccessToAzureResources() { createAcrIfNotExists() { # check if container registry exists - if [ ! -z "$CONTAINER_REGISTRY_SERVER" ]; then - printf "Checking if container registry '$CONTAINER_REGISTRY_SERVER' exists... " - az acr show --name $CONTAINER_REGISTRY_SERVER > /dev/null 2>&1 - exitIfCommandFailed $? "Container registry '$CONTAINER_REGISTRY_SERVER' not found, exiting..." - printf "Yes.\n" + printf "Checking if container registry exists... " + local existingRegistry + existingRegistry=$(az acr show --name $CONTAINER_REGISTRY_SERVER --query loginServer -o tsv 2>/dev/null) + if [ $? -eq 0 ]; then + printf "Yes.\nUsing existing registry '$existingRegistry'.\n" + CONTAINER_REGISTRY_SERVER=$existingRegistry return 0 fi # else deploy a new container registry - printf "Creating container registry... " + printf "No.\nCreating container registry... " AZURE_ACR_DEPLOY_RESULT=$(az deployment group create --resource-group $RESOURCE_GROUP --name "acr-deployment" --template-file core/acr/acr.bicep --only-show-errors --no-prompt -o json \ --parameters "name=$CONTAINER_REGISTRY_SERVER") exitIfCommandFailed $? "Error creating container registry, exiting..." CONTAINER_REGISTRY_SERVER=$(jq -r .properties.outputs.loginServer.value <<< $AZURE_ACR_DEPLOY_RESULT) exitIfValueEmpty "$CONTAINER_REGISTRY_SERVER" "Unable to parse container registry login server from deployment, exiting..." - printf "container registry '$CONTAINER_REGISTRY_SERVER' created.\n" + printf "'$CONTAINER_REGISTRY_SERVER' created.\n" } deployDockerImageToACR() {