From 55e1f94c8fd9cb29a25500f6078605a2df30cb42 Mon Sep 17 00:00:00 2001 From: Prasanjeet-Microsoft Date: Fri, 28 Mar 2025 13:44:05 +0530 Subject: [PATCH 1/2] Enhance deployment: Add .dockerignore and optimize PowerShell script for cross-OS support --- App/frontend-app/.dockerignore | 1 + Deployment/resourcedeployment.ps1 | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 App/frontend-app/.dockerignore diff --git a/App/frontend-app/.dockerignore b/App/frontend-app/.dockerignore new file mode 100644 index 00000000..3c3629e6 --- /dev/null +++ b/App/frontend-app/.dockerignore @@ -0,0 +1 @@ +node_modules diff --git a/Deployment/resourcedeployment.ps1 b/Deployment/resourcedeployment.ps1 index f351e8f2..eaabae69 100644 --- a/Deployment/resourcedeployment.ps1 +++ b/Deployment/resourcedeployment.ps1 @@ -917,32 +917,32 @@ try { # 2. Build and push the images to Azure Container Registry # 2-1. Build and push the AI Service container image to Azure Container Registry #$acrAIServiceTag = "$($deploymentResult.AzContainerRegistryName).azurecr.io/$acrNamespace/aiservice" - docker build ..\App\backend-api\. --no-cache -t $acrAIServiceTag + docker build "../App/backend-api/." --no-cache -t $acrAIServiceTag docker push $acrAIServiceTag # 2-2. Build and push the Kernel Memory Service container image to Azure Container Registry #$acrKernelMemoryTag = "$($deploymentResult.AzContainerRegistryName).azurecr.io/$acrNamespace/kernelmemory" - docker build ..\App\kernel-memory\. --no-cache -t $acrKernelMemoryTag + docker build "../App/kernel-memory/." --no-cache -t $acrKernelMemoryTag docker push $acrKernelMemoryTag # 2-3. Build and push the Frontend App Service container image to Azure Container Registry #$acrFrontAppTag = "$($deploymentResult.AzContainerRegistryName).azurecr.io/$acrNamespace/frontapp" - docker build ..\App\frontend-app\. --no-cache -t $acrFrontAppTag + docker build "../App/frontend-app/." --no-cache -t $acrFrontAppTag docker push $acrFrontAppTag #====================================================================================================================================================================== # 7.2. Deploy ClusterIssuer in Kubernetes for SSL/TLS certificate - kubectl apply -f .\kubernetes\deploy.certclusterissuer.yaml + kubectl apply -f "./kubernetes/deploy.certclusterissuer.yaml" # 7.3. Deploy Deployment in Kubernetes - kubectl apply -f .\kubernetes\deploy.deployment.yaml -n $kubenamespace + kubectl apply -f "./kubernetes/deploy.deployment.yaml" -n $kubenamespace # 7.4. Deploy Services in Kubernetes - kubectl apply -f .\kubernetes\deploy.service.yaml -n $kubenamespace + kubectl apply -f "./kubernetes/deploy.service.yaml" -n $kubenamespace # 7.5. Deploy Ingress Controller in Kubernetes for external access - kubectl apply -f .\kubernetes\deploy.ingress.yaml -n $kubenamespace + kubectl apply -f "./kubernetes/deploy.ingress.yaml" -n $kubenamespace # ##################################################################### # # Data file uploading From acbc4d2ecb16707bae8c91527f0f08e164c673ac Mon Sep 17 00:00:00 2001 From: Prasanjeet-Microsoft Date: Tue, 1 Apr 2025 08:13:23 +0000 Subject: [PATCH 2/2] Renamed folder Bicep to bicep --- Deployment/{Bicep => bicep}/azureappconfigservice.bicep | 0 Deployment/{Bicep => bicep}/azurecognitiveservice.bicep | 0 Deployment/{Bicep => bicep}/azurecontainerregistry.bicep | 0 Deployment/{Bicep => bicep}/azurecosmosdb.bicep | 0 Deployment/{Bicep => bicep}/azurekubernetesservice.bicep | 0 Deployment/{Bicep => bicep}/azureopenaiservice.bicep | 0 Deployment/{Bicep => bicep}/azureopenaiservicemodel.bicep | 0 Deployment/{Bicep => bicep}/azureroleassignacrpull.bicep | 0 Deployment/{Bicep => bicep}/azuresearch.bicep | 0 Deployment/{Bicep => bicep}/azurestorageaccount.bicep | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename Deployment/{Bicep => bicep}/azureappconfigservice.bicep (100%) rename Deployment/{Bicep => bicep}/azurecognitiveservice.bicep (100%) rename Deployment/{Bicep => bicep}/azurecontainerregistry.bicep (100%) rename Deployment/{Bicep => bicep}/azurecosmosdb.bicep (100%) rename Deployment/{Bicep => bicep}/azurekubernetesservice.bicep (100%) rename Deployment/{Bicep => bicep}/azureopenaiservice.bicep (100%) rename Deployment/{Bicep => bicep}/azureopenaiservicemodel.bicep (100%) rename Deployment/{Bicep => bicep}/azureroleassignacrpull.bicep (100%) rename Deployment/{Bicep => bicep}/azuresearch.bicep (100%) rename Deployment/{Bicep => bicep}/azurestorageaccount.bicep (100%) diff --git a/Deployment/Bicep/azureappconfigservice.bicep b/Deployment/bicep/azureappconfigservice.bicep similarity index 100% rename from Deployment/Bicep/azureappconfigservice.bicep rename to Deployment/bicep/azureappconfigservice.bicep diff --git a/Deployment/Bicep/azurecognitiveservice.bicep b/Deployment/bicep/azurecognitiveservice.bicep similarity index 100% rename from Deployment/Bicep/azurecognitiveservice.bicep rename to Deployment/bicep/azurecognitiveservice.bicep diff --git a/Deployment/Bicep/azurecontainerregistry.bicep b/Deployment/bicep/azurecontainerregistry.bicep similarity index 100% rename from Deployment/Bicep/azurecontainerregistry.bicep rename to Deployment/bicep/azurecontainerregistry.bicep diff --git a/Deployment/Bicep/azurecosmosdb.bicep b/Deployment/bicep/azurecosmosdb.bicep similarity index 100% rename from Deployment/Bicep/azurecosmosdb.bicep rename to Deployment/bicep/azurecosmosdb.bicep diff --git a/Deployment/Bicep/azurekubernetesservice.bicep b/Deployment/bicep/azurekubernetesservice.bicep similarity index 100% rename from Deployment/Bicep/azurekubernetesservice.bicep rename to Deployment/bicep/azurekubernetesservice.bicep diff --git a/Deployment/Bicep/azureopenaiservice.bicep b/Deployment/bicep/azureopenaiservice.bicep similarity index 100% rename from Deployment/Bicep/azureopenaiservice.bicep rename to Deployment/bicep/azureopenaiservice.bicep diff --git a/Deployment/Bicep/azureopenaiservicemodel.bicep b/Deployment/bicep/azureopenaiservicemodel.bicep similarity index 100% rename from Deployment/Bicep/azureopenaiservicemodel.bicep rename to Deployment/bicep/azureopenaiservicemodel.bicep diff --git a/Deployment/Bicep/azureroleassignacrpull.bicep b/Deployment/bicep/azureroleassignacrpull.bicep similarity index 100% rename from Deployment/Bicep/azureroleassignacrpull.bicep rename to Deployment/bicep/azureroleassignacrpull.bicep diff --git a/Deployment/Bicep/azuresearch.bicep b/Deployment/bicep/azuresearch.bicep similarity index 100% rename from Deployment/Bicep/azuresearch.bicep rename to Deployment/bicep/azuresearch.bicep diff --git a/Deployment/Bicep/azurestorageaccount.bicep b/Deployment/bicep/azurestorageaccount.bicep similarity index 100% rename from Deployment/Bicep/azurestorageaccount.bicep rename to Deployment/bicep/azurestorageaccount.bicep