Merge pull request #2 from hunterjam/psl-contentgen

Infra code updates, docker file addition for frontend

Author: hunterjam

.devcontainer/devcontainer.json

@@ -0,0 +1,38 @@
+{
+    "name": "azd-template",
+    "image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
+    "forwardPorts": [3000, 5000],
+    "features": {
+        "ghcr.io/devcontainers/features/node:1": {
+            "nodeGypDependencies": true,
+            "installYarnUsingApt": true,
+            "version": "lts",
+            "pnpmVersion": "latest",
+            "nvmVersion": "latest"
+        },
+        "ghcr.io/devcontainers/features/azure-cli:1": {
+            "installBicep": true,
+            "version": "latest",
+            "bicepVersion": "latest"
+        },
+        "ghcr.io/azure/azure-dev/azd:0": {
+            "version": "stable"
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-azuretools.azure-dev",
+                "ms-azuretools.vscode-bicep",
+                "ms-python.python",
+                "ms-toolsai.jupyter",
+                "GitHub.vscode-github-actions"
+            ]
+        }
+    },
+    "postCreateCommand": "bash ./.devcontainer/setup_env.sh",
+    "remoteUser": "vscode",
+    "hostRequirements": {
+        "memory": "4gb"
+    }
+}

.devcontainer/setup_env.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+git fetch
+git pull

Dockerfile

@@ -72,7 +72,7 @@ Follow the quick deploy steps on the deployment guide to deploy this solution to
 [Click here to launch the deployment guide](./content-gen/docs/DEPLOYMENT.md)
 <br/><br/>
 
-| [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/microsoft/document-generation-solution-accelerator) | [![Open in Dev Containers](https://img.shields.io/static/v1?style=for-the-badge&label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/document-generation-solution-accelerator) | [![Open in Visual Studio Code Web](https://img.shields.io/static/v1?style=for-the-badge&label=Visual%20Studio%20Code%20(Web)&message=Open&color=blue&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/azure/?vscode-azure-exp=foundry&agentPayload=eyJiYXNlVXJsIjogImh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9taWNyb3NvZnQvZG9jdW1lbnQtZ2VuZXJhdGlvbi1zb2x1dGlvbi1hY2NlbGVyYXRvci9yZWZzL2hlYWRzL21haW4vaW5mcmEvdnNjb2RlX3dlYiIsICJpbmRleFVybCI6ICIvaW5kZXguanNvbiIsICJ2YXJpYWJsZXMiOiB7ImFnZW50SWQiOiAiIiwgImNvbm5lY3Rpb25TdHJpbmciOiAiIiwgInRocmVhZElkIjogIiIsICJ1c2VyTWVzc2FnZSI6ICIiLCAicGxheWdyb3VuZE5hbWUiOiAiIiwgImxvY2F0aW9uIjogIiIsICJzdWJzY3JpcHRpb25JZCI6ICIiLCAicmVzb3VyY2VJZCI6ICIiLCAicHJvamVjdFJlc291cmNlSWQiOiAiIiwgImVuZHBvaW50IjogIiJ9LCAiY29kZVJvdXRlIjogWyJhaS1wcm9qZWN0cy1zZGsiLCAicHl0aG9uIiwgImRlZmF1bHQtYXp1cmUtYXV0aCIsICJlbmRwb2ludCJdfQ==) |
+| [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/hunterjam/content-generation-solution-accelerator) | [![Open in Dev Containers](https://img.shields.io/static/v1?style=for-the-badge&label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/hunterjam/content-generation-solution-accelerator) | [![Open in Visual Studio Code Web](https://img.shields.io/static/v1?style=for-the-badge&label=Visual%20Studio%20Code%20(Web)&message=Open&color=blue&logo=visualstudiocode&logoColor=white)](https://vscode.dev/azure/?vscode-azure-exp=foundry&agentPayload=eyJiYXNlVXJsIjogImh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9odW50ZXJqYW0vY29udGVudC1nZW5lcmF0aW9uLXNvbHV0aW9uLWFjY2VsZXJhdG9yL3JlZnMvaGVhZHMvbWFpbi9jb250ZW50LWdlbi9pbmZyYS92c2NvZGVfd2ViIiwgImluZGV4VXJsIjogIi9pbmRleC5qc29uIiwgInZhcmlhYmxlcyI6IHsiYWdlbnRJZCI6ICIiLCAiY29ubmVjdGlvblN0cmluZyI6ICIiLCAidGhyZWFkSWQiOiAiIiwgInVzZXJNZXNzYWdlIjogIiIsICJwbGF5Z3JvdW5kTmFtZSI6ICIiLCAibG9jYXRpb24iOiAiIiwgInN1YnNjcmlwdGlvbklkIjogIiIsICJyZXNvdXJjZUlkIjogIiIsICJwcm9qZWN0UmVzb3VyY2VJZCI6ICIiLCAiZW5kcG9pbnQiOiAiIn0sICJjb2RlUm91dGUiOiBbImFpLXByb2plY3RzLXNkayIsICJweXRob24iLCAiZGVmYXVsdC1henVyZS1hdXRoIiwgImVuZHBvaW50Il19) |
 |---|---|---|
 
 <br/>

README.md

@@ -46,46 +46,12 @@ infra:
   path: ./infra
   module: main
 
-# Custom workflow: 
-# 1. First provision creates infrastructure (skips ACI for private networking)
-# 2. Build container image to ACR
-# 3. Second provision creates ACI with the now-available image
 workflows:
   up:
     steps:
       - azd: provision
 
 hooks:
-  preprovision:
-    windows:
-      run: |
-        Write-Host "Preparing Content Generation Solution Accelerator deployment..." -ForegroundColor Cyan
-        Write-Host "Checking Azure CLI authentication..."
-        az account show --query "{name:name, id:id}" -o table
-        
-        # For private networking on first run, skip ACI (image not yet in ACR)
-        $currentSkip = azd env get-value skipContainerDeployment 2>$null
-        if ($env:enablePrivateNetworking -eq 'true' -and -not $env:ACR_NAME -and $currentSkip -ne 'false') {
-          Write-Host "Private networking enabled - skipping container deployment until image is built" -ForegroundColor Yellow
-          azd env set skipContainerDeployment true
-        }
-      shell: pwsh
-      continueOnError: false
-    posix:
-      run: |
-        echo "Preparing Content Generation Solution Accelerator deployment..."
-        echo "Checking Azure CLI authentication..."
-        az account show --query "{name:name, id:id}" -o table
-        
-        # For private networking on first run, skip ACI (image not yet in ACR)
-        current_skip=$(azd env get-value skipContainerDeployment 2>/dev/null || echo "")
-        if [ "$enablePrivateNetworking" = "true" ] && [ -z "$ACR_NAME" ] && [ "$current_skip" != "false" ]; then
-          echo "Private networking enabled - skipping container deployment until image is built"
-          azd env set skipContainerDeployment true
-        fi
-      shell: sh
-      continueOnError: false
-
   postprovision:
     windows:
       run: |
@@ -116,81 +82,14 @@ hooks:
           Write-Host "  Cosmos DB role may already be assigned" -ForegroundColor Yellow
         }
         
-        # Build container image and deploy ACI if ACR exists and ACI was skipped
-        $skipContainer = azd env get-value skipContainerDeployment 2>$null
-        if ($env:ACR_NAME -and $skipContainer -eq 'true') {
-          Write-Host ""
-          Write-Host "===== Building Container Image =====" -ForegroundColor Yellow
-          Write-Host "Building and pushing image to ACR: $env:ACR_NAME" -ForegroundColor Cyan
-          
-          az acr build --registry $env:ACR_NAME --image content-gen-app:latest --file ./src/WebApp.Dockerfile ./src
-          
-          if ($LASTEXITCODE -eq 0) {
-            Write-Host "Container image built and pushed successfully!" -ForegroundColor Green
-            
-            # Enable container deployment and re-provision
-            Write-Host ""
-            Write-Host "===== Deploying Container Instance =====" -ForegroundColor Yellow
-            azd env set skipContainerDeployment false
-            
-            Write-Host "Re-running provision to deploy ACI..." -ForegroundColor Cyan
-            azd provision --no-prompt
-            
-            if ($LASTEXITCODE -eq 0) {
-              Write-Host "Container Instance deployed successfully!" -ForegroundColor Green
-            } else {
-              Write-Host "Container Instance deployment failed" -ForegroundColor Red
-            }
-          } else {
-            Write-Host "Failed to build container image" -ForegroundColor Red
-          }
-        } elseif ($env:CONTAINER_INSTANCE_NAME) {
+        if ($env:CONTAINER_INSTANCE_NAME) {
           Write-Host ""
           Write-Host "Container Instance: " -NoNewline
           Write-Host "$env:CONTAINER_INSTANCE_NAME" -ForegroundColor Cyan
           Write-Host "Container Private IP: " -NoNewline
           Write-Host "$env:CONTAINER_INSTANCE_PRIVATE_IP" -ForegroundColor Cyan
-        } elseif ($env:ACR_NAME) {
-          Write-Host ""
-          Write-Host "Container Registry: " -NoNewline
-          Write-Host "$env:ACR_NAME" -ForegroundColor Cyan
         }
         
-        # Build and deploy frontend to App Service
-        Write-Host ""
-        Write-Host "===== Building Frontend =====" -ForegroundColor Yellow
-        Push-Location ./src/frontend
-        npm install
-        npm run build
-        
-        if ($LASTEXITCODE -eq 0) {
-          Write-Host "Frontend build completed!" -ForegroundColor Green
-          
-          # Copy build to frontend-server
-          Copy-Item -Path ../static/* -Destination ../frontend-server/static/ -Recurse -Force -ErrorAction SilentlyContinue
-          
-          Push-Location ../frontend-server
-          
-          # Create deployment package
-          Write-Host "Creating deployment package..."
-          Remove-Item -Path frontend-deploy.zip -Force -ErrorAction SilentlyContinue
-          Compress-Archive -Path static, server.js, package.json, package-lock.json -DestinationPath frontend-deploy.zip -Force
-          
-          Write-Host ""
-          Write-Host "===== Deploying Frontend to App Service =====" -ForegroundColor Yellow
-          az webapp deploy --resource-group $env:RESOURCE_GROUP_NAME --name $env:APP_SERVICE_NAME --src-path frontend-deploy.zip --type zip
-          
-          if ($LASTEXITCODE -eq 0) {
-            Write-Host "Frontend deployed successfully!" -ForegroundColor Green
-          } else {
-            Write-Host "Frontend deployment failed" -ForegroundColor Red
-          }
-          
-          Pop-Location
-        } else {
-          Write-Host "Frontend build failed" -ForegroundColor Red
-        }
-        Pop-Location
         
         # Run post-deploy script to upload sample data and create search index
         Write-Host ""
@@ -252,73 +151,14 @@ hooks:
           --principal-id "$signed_user_id" \
           --scope "/" 2>/dev/null && echo "  Cosmos DB role assigned successfully" || echo "  Cosmos DB role may already be assigned"
         
-        # Build container image and deploy ACI if ACR exists and ACI was skipped
-        skip_container=$(azd env get-value skipContainerDeployment 2>/dev/null || echo "")
-        if [ -n "$ACR_NAME" ] && [ "$skip_container" = "true" ]; then
-          echo ""
-          echo "===== Building Container Image ====="
-          echo "Building and pushing image to ACR: $ACR_NAME"
-          
-          if az acr build --registry "$ACR_NAME" --image content-gen-app:latest --file ./src/WebApp.Dockerfile ./src; then
-            echo "Container image built and pushed successfully!"
-            
-            # Enable container deployment and re-provision
-            echo ""
-            echo "===== Deploying Container Instance ====="
-            azd env set skipContainerDeployment false
-            
-            echo "Re-running provision to deploy ACI..."
-            if azd provision --no-prompt; then
-              echo "Container Instance deployed successfully!"
-            else
-              echo "Container Instance deployment failed"
-            fi
-          else
-            echo "Failed to build container image"
-          fi
-        elif [ -n "$CONTAINER_INSTANCE_NAME" ]; then
+        if [ -n "$CONTAINER_INSTANCE_NAME" ]; then
           echo ""
           echo "Container Instance: $CONTAINER_INSTANCE_NAME"
           echo "Container Private IP: $CONTAINER_INSTANCE_PRIVATE_IP"
-        elif [ -n "$ACR_NAME" ]; then
-          echo ""
-          echo "Container Registry: $ACR_NAME"
         fi
         
-        # Build and deploy frontend to App Service
         echo ""
-        echo "===== Building Frontend ====="
-        cd ./src/frontend
-        if npm install && npm run build; then
-          echo "Frontend build completed!"
-          
-          # Copy build to frontend-server
-          cp -r ../static/* ../frontend-server/static/ 2>/dev/null || true
-          
-          cd ../frontend-server
-          
-          # Create deployment package
-          echo "Creating deployment package..."
-          rm -f frontend-deploy.zip
-          zip -r frontend-deploy.zip static/ server.js package.json package-lock.json
-          
-          echo ""
-          echo "===== Deploying Frontend to App Service ====="
-          if az webapp deploy \
-            --resource-group "$RESOURCE_GROUP_NAME" \
-            --name "$APP_SERVICE_NAME" \
-            --src-path frontend-deploy.zip \
-            --type zip; then
-            echo "Frontend deployed successfully!"
-          else
-            echo "Frontend deployment failed"
-          fi
-          
-          cd ../..
-        else
-          echo "Frontend build failed"
-          cd ../..
-        fi
+        echo "Container Registry: $ACR_NAME"
         
         # Run post-deploy script to upload sample data and create search index
         echo ""

content-gen/azure.yaml

@@ -360,9 +360,6 @@ azd up --debug
 
 If deployment gets into a bad state:
 ```bash
-# Clear environment values
-azd env set skipContainerDeployment ""
-
 # Re-run provisioning
 azd provision
 ```