Merge pull request #426 from CodeForPhilly/develop

Release: v1.1.5

Author: taichan03

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [sahilds1] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/containers-publish.yml

@@ -3,6 +3,8 @@ name: "Containers: Publish"
 on:
   release:
     types: [published]
+  push:
+    branches: [develop]
 
 permissions:
   packages: write
@@ -12,7 +14,7 @@ jobs:
     name: Build and Push
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
 
       - name: Login to ghcr.io Docker registry
         uses: docker/login-action@v3
@@ -24,7 +26,18 @@ jobs:
       - name: Compute Docker container image addresses
         run: |
           DOCKER_REPOSITORY="ghcr.io/${GITHUB_REPOSITORY,,}"
-          DOCKER_TAG="${GITHUB_REF:11}"
+          git fetch --tags --force
+          
+          if [[ "${{ github.event_name }}" == "release" ]]; then
+            TAG="${GITHUB_REF#refs/tags/}"
+            DOCKER_TAG="${TAG#v}"
+          else
+            # Pre-release for develop
+            BASE_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+            VERSION="${BASE_TAG#v}"
+            TIMESTAMP=$(date +%Y%m%d%H%M%S)
+            DOCKER_TAG="${VERSION}-dev.${TIMESTAMP}"
+          fi
 
           echo "DOCKER_REPOSITORY=${DOCKER_REPOSITORY}" >> $GITHUB_ENV
           echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV
@@ -44,10 +57,20 @@ jobs:
               --file Dockerfile.prod \
               --tag "${DOCKER_REPOSITORY}/app:latest" \
               --tag "${DOCKER_REPOSITORY}/app:${DOCKER_TAG}" \
+              --build-arg VERSION="${DOCKER_TAG}" \
               .
 
       - name: "Push Docker container image app:latest"
         run: docker push "${DOCKER_REPOSITORY}/app:latest"
 
       - name: "Push Docker container image app:v*"
         run: docker push "${DOCKER_REPOSITORY}/app:${DOCKER_TAG}"
+
+      - name: Save Docker Tag
+        run: echo "${DOCKER_TAG}" > docker_tag.txt
+
+      - name: Upload Docker Tag
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker-tag
+          path: docker_tag.txt

.github/workflows/deploy-downstream.yml

@@ -0,0 +1,35 @@
+name: "Frontend: Lint and Build"
+
+on:
+  push:
+    branches: [develop]
+  pull_request:
+    branches: [develop]
+
+jobs:
+  frontend:
+    name: Lint and Build
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: frontend
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+          cache: "npm"
+          cache-dependency-path: frontend/package-lock.json
+
+      - name: Install dependencies
+        run: npm ci --legacy-peer-deps
+
+      - name: Lint
+        run: npm run lint
+        continue-on-error: true
+
+      - name: Build
+        run: npm run build
+        continue-on-error: true

.github/workflows/frontend-ci.yml

@@ -278,28 +278,6 @@ docker compose exec backend python manage.py test
 ### Frontend Tests
 No test framework currently configured. Consider adding Jest/Vitest for future testing.
 
-## Deployment
-
-### Local Kubernetes (using Devbox)
-```bash
-# Install Devbox first: https://www.jetify.com/devbox
-
-# Add balancertestsite.com to /etc/hosts
-sudo sh -c 'echo "127.0.0.1      balancertestsite.com" >> /etc/hosts'
-
-# Deploy to local k8s cluster
-devbox shell
-devbox create:cluster
-devbox run deploy:balancer
-
-# Access at https://balancertestsite.com:30219/
-```
-
-### Production
-- Manifests: `deploy/manifests/balancer/`
-- ConfigMap: `deploy/manifests/balancer/base/configmap.yml`
-- Secrets: `deploy/manifests/balancer/base/secret.template.yaml`
-
 ## Key Files Reference
 
 - `server/balancer_backend/settings.py` - Django configuration (auth, database, CORS)

CLAUDE.md

@@ -21,6 +21,10 @@ RUN npm run build
 # Stage 2: Build Backend
 FROM python:3.11.4-slim-bullseye
 
+# Receive version argument from build command
+ARG VERSION
+ENV VERSION=${VERSION}
+
 # Set work directory
 WORKDIR /usr/src/app
 
@@ -32,9 +36,11 @@ ENV PYTHONUNBUFFERED=1
 RUN apt-get update && apt-get install -y netcat && rm -rf /var/lib/apt/lists/*
 
 # Install Python dependencies
-RUN pip install --upgrade pip
+RUN pip install --upgrade pip --no-cache-dir
 COPY server/requirements.txt .
-RUN pip install -r requirements.txt
+# Install CPU-only torch to save space (avoids ~4GB of CUDA libs)
+RUN pip install torch --index-url https://download.pytorch.org/whl/cpu --no-cache-dir
+RUN pip install -r requirements.txt --no-cache-dir
 
 # Copy backend application code
 COPY server/ .

Dockerfile.prod

@@ -21,13 +21,17 @@ The project kanban board is [on GitHub here](https://github.com/orgs/CodeForPhil
 
 The Code for Philly Code of Conduct is [here](https://codeforphilly.org/pages/code_of_conduct/) 
 
-### Setting up a development environment   
+### Setting up a development environment
 
 Get the code using git by either forking or cloning `CodeForPhilly/balancer-main`
 
-Tools used to run Balancer:
-1. `OpenAI API`: Ask for an API key and add it to `config/env/env.dev`
-2. `Anthropic API`: Ask for an API key and add it to `config/env/env.dev`
+1. Copy the example environment file:
+   ```bash
+   cp config/env/dev.env.example config/env/dev.env
+   ```
+2. (Optional) Add your API keys to `config/env/dev.env`:
+   - `OpenAI API`
+   - `Anthropic API`
 
 Tools used for development:
 1. `Docker`: Install Docker Desktop
@@ -70,40 +74,6 @@ df = pd.read_sql(query, engine)
 #### Django REST
 - The email and password are set in `server/api/management/commands/createsu.py`
 
-## Local Kubernetes Deployment
-
-### Prereqs
-
-- Fill the configmap with the [env vars](./deploy/manifests/balancer/base/configmap.yml)
-- Install [Devbox](https://www.jetify.com/devbox)
-- Run the following script with admin privileges:
-
-```bash
-HOSTNAME="balancertestsite.com"
-LOCAL_IP="127.0.0.1"
-
-# Check if the correct line already exists
-if grep -q "^$LOCAL_IP[[:space:]]\+$HOSTNAME" /etc/hosts; then
-  echo "Entry for $HOSTNAME with IP $LOCAL_IP already exists in /etc/hosts"
-else
-  echo "Updating /etc/hosts for $HOSTNAME"
-  sudo sed -i "/[[:space:]]$HOSTNAME/d" /etc/hosts
-  echo "$LOCAL_IP      $HOSTNAME" | sudo tee -a /etc/hosts
-fi
-```
-
-### Steps to reproduce
-
-Inside root dir of balancer
-
-```bash
-devbox shell
-devbox create:cluster
-devbox run deploy:balancer
-```
-
-The website should be available in [https://balancertestsite.com:30219/](https://balancertestsite.com:30219/)
-
 ## Architecture
 
 The Balancer website is a Postgres, Django REST, and React project. The source code layout is: