Fix Img environment variable retrieval in docker-build and update React dependencies in package.json

Author: Vamshi-Microsoft

infra/scripts/docker-build.sh

@@ -14,10 +14,12 @@ get_azd_env_value_or_default() {
     local default="$2"
     local required="${3:-false}"
 
-    value=$(azd env get-value "$key" 2>/dev/null || echo "")
+    local value
+    value=$(azd env get-value "$key" 2>/dev/null)
+    local exit_code=$?
 
-    if [ -z "$value" ]; then
-        if [ "$required" = true ]; then
+    if [ $exit_code -ne 0 ] || [ -z "$value" ]; then
+        if [ "$required" = "true" ]; then
             echo "❌ Required environment key '$key' not found." >&2
             exit 1
         else
@@ -27,6 +29,7 @@ get_azd_env_value_or_default() {
 
     echo "$value"
 }
+
 # Required env variables
 AZURE_SUBSCRIPTION_ID=$(get_azd_env_value_or_default "AZURE_SUBSCRIPTION_ID" "" true)
 ENV_NAME=$(get_azd_env_value_or_default "AZURE_ENV_NAME" "" true)
@@ -37,8 +40,8 @@ AZURE_ENV_IMAGETAG=$(get_azd_env_value_or_default "AZURE_ENV_IMAGETAG" "latest"
 CONTAINER_WEB_APP_NAME=$(get_azd_env_value_or_default "CONTAINER_WEB_APP_NAME" "" true)
 CONTAINER_API_APP_NAME=$(get_azd_env_value_or_default "CONTAINER_API_APP_NAME" "" true)
 CONTAINER_APP_NAME=$(get_azd_env_value_or_default "CONTAINER_APP_NAME" "" true)
-$ACR_NAME = $(get_azd_env_value_or_default "CONTAINER_REGISTRY_NAME" "" true)
-$ACR_ENDPOINT = $(get_azd_env_value_or_default "CONTAINER_REGISTRY_LOGIN_SERVER" "" true)
+ACR_NAME=$(get_azd_env_value_or_default "CONTAINER_REGISTRY_NAME" "" true)
+ACR_ENDPOINT=$(get_azd_env_value_or_default "CONTAINER_REGISTRY_LOGIN_SERVER" "" true)
 
 echo "Using the following parameters:"
 echo "AZURE_SUBSCRIPTION_ID = $AZURE_SUBSCRIPTION_ID"

src/ContentProcessorWeb/package.json

@@ -16,8 +16,8 @@
     "nth-check": "2.1.1",
     "postcss": "8.5.6",
     "prismjs": "^1.30.0",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-dropzone": "^14.3.8",
     "react-medium-image-zoom": "^5.2.14",
     "react-redux": "^9.1.2",
@@ -51,8 +51,8 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.30.0",
-    "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.6",
+    "@types/react": "^18.3.18",
+    "@types/react-dom": "^18.3.5",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-virtualized": "^9.22.2",
     "@types/react-window": "^1.8.8",