Merge remote-tracking branch 'origin/develop' into #3936-delete-guest-definition

Author: chrisdicono

.ebextensions/03_ssh_keys.config

@@ -0,0 +1,33 @@
+files:
+  "/tmp/add_authorized_keys.sh":
+    mode: "000755"
+    owner: root
+    group: root
+    content: |
+      #!/bin/bash
+      AUTHORIZED_KEYS="/home/ec2-user/.ssh/authorized_keys"
+      mkdir -p /home/ec2-user/.ssh
+      touch "$AUTHORIZED_KEYS"
+      chown ec2-user:ec2-user /home/ec2-user/.ssh
+      chmod 700 /home/ec2-user/.ssh
+
+      add_key() {
+        local key="$1"
+        if ! grep -qF "$key" "$AUTHORIZED_KEYS"; then
+          echo "$key" >> "$AUTHORIZED_KEYS"
+        fi
+      }
+
+      # Chris Pyle
+      add_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqV5gwot3utGLPGpAPWr8znU1cjMn1RE7jN8htvaOMt aws-eb"
+
+      # Sean Walker
+      add_key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICf1UhVM+65hiKahvdvEj20ohDu+bZVS+btVFJTtg0oP seanwalker@Seans-MacBook-Pro-2.local"
+
+      chown ec2-user:ec2-user "$AUTHORIZED_KEYS"
+      chmod 600 "$AUTHORIZED_KEYS"
+
+commands:
+  add_authorized_keys:
+    command: "/tmp/add_authorized_keys.sh"
+    ignoreErrors: false

.github/workflows/system-tests.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - multitenancy
       - develop
       - feature/**
 

.gitignore

@@ -28,6 +28,9 @@
 *.env
 .agent
 
+# Generated Claude skills (source is src/docs-site/docs/)
+.claude/skills/
+
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
@@ -67,4 +70,5 @@ eb-deploy/
 
 # Claude Code Files
 CLAUDE.md
-.playwright-mcp/
+.playwright-mcp/
+docs/

Dockerfile

@@ -1,5 +1,5 @@
 # Build stage - compile TypeScript
-FROM node:20 AS builder
+FROM node:25 AS builder
 WORKDIR /app
 
 COPY package.json tsconfig.build.json ./
@@ -11,11 +11,11 @@ RUN cd src/backend && npx prisma generate
 RUN yarn build:shared
 RUN yarn build:backend
 
-FROM node:20-slim
+FROM platformatic/node-caged:25-slim
 WORKDIR /app
 
 # Install OpenSSL for Prisma (slim image needs this)
-RUN apt-get update -y && apt-get install -y openssl && rm -rf /var/lib/apt/lists/*
+RUN apt-get update -y && apt-get install -y openssl && rm -rf /var/lib/apt/lists/* && npm install -g yarn
 
 COPY package.json ./
 

devContainerization/Dockerfile.backend.dev

@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:25
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/backend/package.json ./src/backend/tsconfig.json src/backend/

devContainerization/Dockerfile.frontend.dev

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:25-alpine
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/frontend/package.json ./src/frontend/tsconfig.json src/frontend/
@@ -11,4 +11,4 @@ COPY ./src/frontend src/frontend
 COPY ./src/shared src/shared
 
 EXPOSE 3000
-CMD [ "yarn", "workspace", "frontend", "vite", "--force", "--host" ]
+CMD [ "yarn", "workspace", "frontend", "vite", "--force", "--host" ]

infrastructure/modules/elasticbeanstalk/variables.tf

@@ -14,7 +14,7 @@ variable "solution_stack_name" {
   description = "Elastic Beanstalk solution stack name"
   type        = string
   # Find the latest: aws elasticbeanstalk list-available-solution-stacks
-  default     = "64bit Amazon Linux 2023 v4.7.4 running Docker"
+  default     = "64bit Amazon Linux 2023 v4.11.0 running Docker"
 }
 
 variable "vpc_id" {

infrastructure/modules/monitoring/main.tf

@@ -357,6 +357,10 @@ resource "aws_cloudwatch_metric_alarm" "eb_memory_high" {
     Environment = var.environment
     Project     = var.project_name
   }
+
+  lifecycle {
+    ignore_changes = [metric_query]
+  }
 }
 
 #############

infrastructure/modules/network/main.tf

@@ -164,6 +164,14 @@ resource "aws_security_group" "eb_instance" {
     security_groups = [aws_security_group.alb.id]
   }
 
+  ingress {
+    description = "SSH access"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   egress {
     description = "Allow all outbound traffic"
     from_port   = 0

infrastructure/scripts/ssh-to-eb.sh

@@ -58,6 +58,7 @@ echo "🔌 Connecting to EB instance..."
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo ""
 echo "Instance: $INSTANCE_IP ($INSTANCE_ID)"
+echo "Direct SSH: ssh -i $KEY_PATH_EXPANDED ec2-user@$INSTANCE_IP"
 echo "User: ec2-user"
 echo ""
 echo "Useful commands once connected:"