Merge branch 'aca' into aks

Author: dminkovski

.devcontainer/devcontainer.json

@@ -19,6 +19,11 @@
         "ghcr.io/devcontainers-contrib/features/typescript:2": {},
         "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
             "version": "1.1.8"
+        },
+        "docker-in-docker": {
+            "version": "latest",
+            "moby": true,
+            "dockerDashComposeVersion": "v1"
         }
     },
     "customizations": {

README.md

@@ -43,7 +43,7 @@ What this demo application does:
 ![Chat screen](docs/chatscreen.png)
 
 
-## Solution Architecture and deployment Options
+## Solution Architecture and deployment options
 
 ![Microservice RAG Architecture](docs/aks/aks-hla.png)
 

deploy/aca/infra/app/api.bicep

@@ -33,6 +33,7 @@ module app '../../../shared/host/container-app-upsert.bicep' = {
     containerCpuCoreCount: '1.0'
     containerMemory: '2.0Gi'
     targetPort: 8080
+    external:false
     env: union(env, [
       {
         name: 'AZURE_CLIENT_ID'

deploy/aca/infra/app/indexer.bicep

@@ -31,6 +31,7 @@ module app '../../../shared/host/container-app-upsert.bicep' = {
     containerCpuCoreCount: '1.0'
     containerMemory: '2.0Gi'
     targetPort: 8080
+    external:false
     env: union(env, [
       {
         name: 'AZURE_CLIENT_ID'

deploy/aca/scripts/prepdocs.sh

@@ -13,12 +13,12 @@ services:
       prepackage:
         windows:
           shell: pwsh
-          run:  cd ../frontend;npm install;npm run build; cp -r ./build/* ../backend/src/main/resources/static
+          run:  cd ../frontend;npm install;npm run build; New-Item -ItemType Directory -Path "../backend/src/main/resources/static" -ErrorAction SilentlyContinue; Copy-Item ".\build\*" "..\backend\src\main\resources\static" -Recurse -Force
           interactive: true
           continueOnError: false
         posix:
           shell: sh
-          run:  cd ../frontend;npm install;npm run build; cp -r ./build/* ../backend/src/main/resources/static
+          run:  cd ../frontend;npm install;npm run build; mkdir -p ../backend/src/main/resources/static; cp -r ./build/* ../backend/src/main/resources/static
           interactive: true
           continueOnError: false