Merge branch 'develop' into 382-postgresql-crash-workaround

Author: sahilds1

.dockerignore

@@ -0,0 +1,3 @@
+server/.gitignore
+server/Dockerfile
+server/entrypoint.sh

.github/workflows/containers-publish.yml

@@ -1,8 +1,8 @@
 name: "Containers: Publish"
 
 on:
-  push:
-    tags: ["v*"]
+  release:
+    types: [published]
 
 permissions:
   packages: write
@@ -12,10 +12,10 @@ jobs:
     name: Build and Push
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
 
       - name: Login to ghcr.io Docker registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -34,36 +34,20 @@ jobs:
       # - name: 'Pull previous Docker container image: :latest'
       #   run: docker pull "${DOCKER_REPOSITORY}:latest" || true
 
-      - name: "Pull previous Docker container image: frontend-static:latest"
-        run: docker pull "${DOCKER_REPOSITORY}/frontend-static:latest" || true
+      - name: "Pull previous Docker container image: app:latest"
+        run: docker pull "${DOCKER_REPOSITORY}/app:latest" || true
 
-      - name: "Build Docker container image: frontend-static:latest"
+      - name: "Build Docker container image: app:latest"
         run: |
           docker build \
-              --cache-from "${DOCKER_REPOSITORY}/frontend-static:latest" \
-              --file frontend/Dockerfile.demo \
-              --build-arg SERVER_NAME=localhost \
-              --tag "${DOCKER_REPOSITORY}/frontend-static:latest" \
-              --tag "${DOCKER_REPOSITORY}/frontend-static:${DOCKER_TAG}" \
-              frontend
-      - name: "Push Docker container image frontend-static:latest"
-        run: docker push "${DOCKER_REPOSITORY}/frontend-static:latest"
+              --cache-from "${DOCKER_REPOSITORY}/app:latest" \
+              --file Dockerfile.prod \
+              --tag "${DOCKER_REPOSITORY}/app:latest" \
+              --tag "${DOCKER_REPOSITORY}/app:${DOCKER_TAG}" \
+              .
 
-      - name: "Push Docker container image frontend-static:v*"
-        run: docker push "${DOCKER_REPOSITORY}/frontend-static:${DOCKER_TAG}"
-#
-#
-#    - name: 'Build Docker container image: backend:latest'
-#      run: |
-#        cd backend && \
-#        make && \
-#        docker image tag "${DOCKER_REPOSITORY}/backend/local:latest" "${DOCKER_REPOSITORY}/backend:latest"
-#
-#    - name: Push Docker container image backend:latest
-#      run: docker push "${DOCKER_REPOSITORY}/backend:latest"
-#
-#    - name: Push Docker container image backend:v*
-#      run: docker push "${DOCKER_REPOSITORY}/backend:${DOCKER_TAG}"
+      - name: "Push Docker container image app:latest"
+        run: docker push "${DOCKER_REPOSITORY}/app:latest"
 
-# - name: Push Docker container image :v*"
-#   run: docker push "${DOCKER_REPOSITORY}:${DOCKER_TAG}"
+      - name: "Push Docker container image app:v*"
+        run: docker push "${DOCKER_REPOSITORY}/app:${DOCKER_TAG}"

.gitignore

@@ -1,3 +1,3 @@
-config/*
-.idea/
-env*
+config/env/*
+!config/env/*.example
+.idea/

Dockerfile.prod

@@ -0,0 +1,52 @@
+# Multi-stage Dockerfile for Balancer Application
+# Produces a single image with Django backend serving the React frontend
+
+# Stage 1: Build Frontend
+FROM node:18 AS frontend-builder
+
+WORKDIR /frontend
+
+# Copy frontend package files
+COPY frontend/package*.json ./
+
+# Install dependencies
+RUN npm ci --legacy-peer-deps
+
+# Copy frontend source
+COPY frontend/ ./
+
+# Build frontend - outputs to dist/ as configured in vite.config.ts
+RUN npm run build
+
+# Stage 2: Build Backend
+FROM python:3.11.4-slim-bullseye
+
+# Set work directory
+WORKDIR /usr/src/app
+
+# Set environment variables
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y netcat && rm -rf /var/lib/apt/lists/*
+
+# Install Python dependencies
+RUN pip install --upgrade pip
+COPY server/requirements.txt .
+RUN pip install -r requirements.txt
+
+# Copy backend application code
+COPY server/ .
+
+# Copy frontend build from frontend-builder stage to where Django expects it
+COPY --from=frontend-builder /frontend/dist ./build
+
+# Expose port
+EXPOSE 8000
+
+# Run entrypoint
+ENTRYPOINT ["./entrypoint.prod.sh"]
+
+# Start gunicorn
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000", "--noreload"]

config/env/.env.prod.db

@@ -13,4 +13,4 @@ OPENAI_API_KEY=
 ANTHROPIC_API_KEY=
 PINECONE_API_KEY=
 EMAIL_HOST_USER=
-EMAIL_HOST_PASSWORD=
+EMAIL_HOST_PASSWORD=

config/env/env.dev renamed to config/env/dev.env.example

@@ -1,7 +1,6 @@
 DEBUG=0
 SECRET_KEY=change_this
 DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]
-DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]
 SQL_ENGINE=django.db.backends.postgresql
 SQL_DATABASE=balancer_prod
 SQL_USER=set_me
@@ -10,5 +9,8 @@ SQL_HOST=db
 SQL_PORT=5432
 DATABASE=postgres
 LOGIN_REDIRECT_URL=
+OPENAI_API_KEY=
+ANTHROPIC_API_KEY=
+PINECONE_API_KEY=
 EMAIL_HOST_USER=
-EMAIL_HOST_PASSWORD=
+EMAIL_HOST_PASSWORD=