fix parameter issue in docker-build.sh

Author: Pavan-Microsoft

.devcontainer/setup_env.sh

@@ -6,4 +6,6 @@ git pull
 # provide execute permission to quotacheck script
 sudo chmod +x ./infra/scripts/checkquota_km.sh
 sudo chmod +x ./infra/scripts/quota_check_params.sh
-sudo chmod +x ./infra/scripts/run_process_data_scripts.sh
+sudo chmod +x ./infra/scripts/run_process_data_scripts.sh
+sudo chmod +x ./infra/scripts/docker-build.sh
+sudo chmod +x ./infra/scripts/docker-build.ps1

infra/scripts/docker-build.ps1

@@ -24,42 +24,55 @@ if ($USE_LOCAL_BUILD -eq $false) {
 
 Write-Output "Local Build enabled. Starting build process."
 
-# STEP 1: Set Azure subscription
+# STEP 1: Ensure user is logged into Azure
+Write-Host "Checking Azure login status..."
+$account = az account show 2>$null | ConvertFrom-Json
+
+if (-not $account) {
+    Write-Host "Not logged in. Attempting az login..."
+    az login | Out-Null
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Azure login failed."
+        exit 1
+    }
+} else {
+    Write-Host "Already logged in to Azure as: $($account.user.name)"
+}
+
+# STEP 2: Set Azure subscription
 az account set --subscription "$AZURE_SUBSCRIPTION_ID"
 if ($LASTEXITCODE -ne 0) {
     Write-Error "Failed to set Azure subscription."
     exit 1
 }
 
-# STEP 2: Deploy container registry
+# STEP 3: Deploy container registry
 Write-Host "Deploying container registry in location: $AZURE_LOCATION"
 $OUTPUTS = az deployment group create --resource-group $AZURE_RESOURCE_GROUP --template-file "./infra/deploy_container_registry.bicep" --parameters environmentName=$ENV_NAME --query "properties.outputs" --output json | ConvertFrom-Json
 
 # Extract ACR name and endpoint
 $ACR_NAME = $OUTPUTS.createdAcrName.value
-$ACR_ENDPOINT = $OUTPUTS.acrEndpoint.value
 
 Write-Host "Extracted ACR Name: $ACR_NAME"
-Write-Host "Extracted ACR Endpoint: $ACR_ENDPOINT"
 
-# STEP 3: Login to Azure Container Registry
+# STEP 4: Login to Azure Container Registry
 Write-Host "Logging into Azure Container Registry: $ACR_NAME"
 az acr login -n $ACR_NAME
 if ($LASTEXITCODE -ne 0) {
     Write-Error "Failed to log in to ACR"
     exit 1
 }
 
-# STEP 4: Get current script directory
+# STEP 5: Get current script directory
 $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 
-# STEP 5: Resolve full paths to Dockerfiles and build contexts
+# STEP 6: Resolve full paths to Dockerfiles and build contexts
 $WebAppDockerfilePath = Join-Path $ScriptDir "..\..\src\App\WebApp.Dockerfile" | Resolve-Path
 $WebAppContextPath = Join-Path $ScriptDir "..\..\src\App" | Resolve-Path
 $ApiAppDockerfilePath = Join-Path $ScriptDir "..\..\src\api\ApiApp.Dockerfile" | Resolve-Path
 $ApiAppContextPath = Join-Path $ScriptDir "..\..\src\api" | Resolve-Path
 
-# STEP 6: Define function to build and push Docker images
+# STEP 7: Define function to build and push Docker images
 function Build-And-Push-Image {
     param (
         [string]$IMAGE_NAME,
@@ -88,7 +101,7 @@ function Build-And-Push-Image {
     Write-Host "--- Docker image pushed successfully: $IMAGE_URI ---`n"
 }
 
-# STEP 7: Build and push images with provided tag
+# STEP 8: Build and push images with provided tag
 $ACR_IMAGE_TAG = "latest"
 Build-And-Push-Image "km-api" $ApiAppDockerfilePath $ApiAppContextPath $ACR_IMAGE_TAG
 Build-And-Push-Image "km-app" $WebAppDockerfilePath $WebAppContextPath $ACR_IMAGE_TAG

infra/scripts/docker-build.sh

@@ -18,21 +18,33 @@ fi
 which jq || { echo "jq is not installed"; exit 1; }
 
 # Exit early if local build is not requested
-if [[ "$USE_LOCAL_BUILD" != "true" ]]; then
+if [[ "${USE_LOCAL_BUILD,,}" != "true" ]]; then
     echo "Local Build not enabled. Using prebuilt image."
     exit 0
 fi
 
 echo "Local Build enabled. Starting build process."
 
-# STEP 1: Set Azure subscription
+# STEP 1: Ensure user is logged into Azure
+if ! az account show > /dev/null 2>&1; then
+    echo "Not logged in to Azure. Attempting az login..."
+    az login
+    if [[ $? -ne 0 ]]; then
+        echo "Azure login failed."
+        exit 1
+    fi
+else
+    echo "Already logged in to Azure."
+fi
+
+# STEP 2: Set Azure subscription
 az account set --subscription "$AZURE_SUBSCRIPTION_ID"
 if [[ $? -ne 0 ]]; then
     echo "Failed to set Azure subscription."
     exit 1
 fi
 
-# STEP 2: Deploy container registry
+# STEP 3: Deploy container registry
 echo "Deploying container registry in location: $AZURE_LOCATION"
 OUTPUTS=$(az deployment group create \
     --resource-group "$AZURE_RESOURCE_GROUP" \
@@ -42,29 +54,27 @@ OUTPUTS=$(az deployment group create \
     --output json)
 
 ACR_NAME=$(echo "$OUTPUTS" | jq -r '.createdAcrName.value')
-ACR_ENDPOINT=$(echo "$OUTPUTS" | jq -r '.acrEndpoint.value')
 
 echo "Extracted ACR Name: $ACR_NAME"
-echo "Extracted ACR Endpoint: $ACR_ENDPOINT"
 
-# STEP 3: Login to Azure Container Registry
+# STEP 4: Login to Azure Container Registry
 echo "Logging into Azure Container Registry: $ACR_NAME"
 az acr login -n "$ACR_NAME"
 if [[ $? -ne 0 ]]; then
     echo "Failed to log in to ACR"
     exit 1
 fi
 
-# STEP 4: Get current script directory
+# STEP 5: Get current script directory
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# STEP 5: Resolve full paths to Dockerfiles and build contexts
+# STEP 6: Resolve full paths to Dockerfiles and build contexts
 WEBAPP_DOCKERFILE_PATH="$SCRIPT_DIR/../../src/App/WebApp.Dockerfile"
 WEBAPP_CONTEXT_PATH="$SCRIPT_DIR/../../src/App"
 APIAPP_DOCKERFILE_PATH="$SCRIPT_DIR/../../src/api/ApiApp.Dockerfile"
 APIAPP_CONTEXT_PATH="$SCRIPT_DIR/../../src/api"
 
-# STEP 6: Define function to build and push Docker images
+# STEP 7: Define function to build and push Docker images
 build_and_push_image() {
     IMAGE_NAME="$1"
     BUILD_PATH="$2"
@@ -90,7 +100,7 @@ build_and_push_image() {
     echo "--- Docker image pushed successfully: $IMAGE_URI ---"
 }
 
-# STEP 7: Build and push images with provided tag
+# STEP 8: Build and push images with provided tag
 ACR_IMAGE_TAG="latest"
 build_and_push_image "km-api" "$APIAPP_DOCKERFILE_PATH" "$APIAPP_CONTEXT_PATH" "$ACR_IMAGE_TAG"
 build_and_push_image "km-app" "$WEBAPP_DOCKERFILE_PATH" "$WEBAPP_CONTEXT_PATH" "$ACR_IMAGE_TAG"