Merge pull request #455 from TineoC/fix/deploy-api-and-ci

fix: deploy API and CI — release-based image tags, version endpoint, prod compose

Author: taichan03

.github/workflows/containers-publish.yml

@@ -26,12 +26,17 @@ jobs:
       - name: Compute Docker container image addresses
         run: |
           DOCKER_REPOSITORY="ghcr.io/${GITHUB_REPOSITORY,,}"
+          git fetch --tags --force
           
           if [[ "${{ github.event_name }}" == "release" ]]; then
-            DOCKER_TAG="${GITHUB_REF:11}"
+            TAG="${GITHUB_REF#refs/tags/}"
+            DOCKER_TAG="${TAG#v}"
           else
-            SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
-            DOCKER_TAG="dev-${SHORT_SHA}"
+            # 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
@@ -52,6 +57,7 @@ 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"

.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

@@ -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
 

Dockerfile.prod

@@ -0,0 +1,42 @@
+name: balancer-prod
+version: "3.8"
+
+services:
+  db:
+    image: pgvector/pgvector:pg15
+    volumes:
+      - postgres_data_prod:/var/lib/postgresql/data/
+      - ./db/init-vector-extension.sql:/docker-entrypoint-initdb.d/init-vector-extension.sql
+    environment:
+      - POSTGRES_USER=balancer
+      - POSTGRES_PASSWORD=balancer
+      - POSTGRES_DB=balancer_dev
+    networks:
+      - app_net
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U balancer -d balancer_dev"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  app:
+    image: balancer-app
+    build:
+      context: .
+      dockerfile: Dockerfile.prod
+    ports:
+      - "8000:8000"
+    env_file:
+      - ./config/env/prod.env
+    depends_on:
+      db:
+        condition: service_healthy
+    networks:
+      - app_net
+
+volumes:
+  postgres_data_prod:
+
+networks:
+  app_net:
+    driver: bridge

db/Dockerfile

@@ -1,15 +1,9 @@
 services:
   db:
-    # Workaround for PostgreSQL crash with pgvector v0.6.1 on ARM64
-    # image: pgvector/pgvector:pg15
-    # volumes:
-    #   - postgres_data:/var/lib/postgresql/data/
-    #   - ./db/init-vector-extension.sql:/docker-entrypoint-initdb.d/init-vector-extension.sql
-    build:
-      context: ./db
-      dockerfile: Dockerfile
+    image: pgvector/pgvector:pg15
     volumes:
       - postgres_data:/var/lib/postgresql/data/
+      - ./db/init-vector-extension.sql:/docker-entrypoint-initdb.d/init-vector-extension.sql
     environment:
       - POSTGRES_USER=balancer
       - POSTGRES_PASSWORD=balancer
@@ -24,17 +18,26 @@ services:
     networks:
       app_net:
         ipv4_address: 192.168.0.2
-  # pgadmin:
-  #   container_name: pgadmin4
-  #   image: dpage/pgadmin4
-  #   environment:
-  #     PGADMIN_DEFAULT_EMAIL: balancer-noreply@codeforphilly.org
-  #     PGADMIN_DEFAULT_PASSWORD: balancer
-  #   ports:
-  #     - "5050:80"
-  #   networks:
-  #     app_net:
-  #       ipv4_address: 192.168.0.4
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U balancer -d balancer_dev"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+  pgadmin:
+    image: dpage/pgadmin4
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=balancer-noreply@codeforphilly.org
+      - PGADMIN_DEFAULT_PASSWORD=balancer
+    ports:
+      - "5050:80"
+    depends_on:
+      db:
+        condition: service_healthy
+    networks:
+      app_net:
+        ipv4_address: 192.168.0.4
+
   backend:
     image: balancer-backend
     build: ./server
@@ -52,6 +55,13 @@ services:
     networks:
       app_net:
         ipv4_address: 192.168.0.3
+    healthcheck:
+      test: ["CMD-SHELL", "python3 -c 'import http.client;conn=http.client.HTTPConnection(\"localhost:8000\");conn.request(\"GET\",\"/admin/login/\");res=conn.getresponse();exit(0 if res.status in [200,301,302,401] else 1)'"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+
   frontend:
     image: balancer-frontend
     build:
@@ -67,10 +77,17 @@ services:
       - "./frontend:/usr/src/app:delegated"
       - "/usr/src/app/node_modules/"
     depends_on:
-      - backend
+      backend:
+        condition: service_healthy
     networks:
       app_net:
         ipv4_address: 192.168.0.5
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:3000 || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
 volumes:
   postgres_data:
 networks:
@@ -79,4 +96,4 @@ networks:
       driver: default
       config:
         - subnet: "192.168.0.0/24"
-          gateway: 192.168.0.1
+          gateway: 192.168.0.1

docker-compose.prod.yml

@@ -1,2 +1,2 @@
-# VITE_API_BASE_URL=https://balancertestsite.com/
-VITE_API_BASE_URL=http://localhost:8000
+# Optional: add VITE_* vars here if needed. None required for docker-compose;
+# the app uses relative API URLs and vite.config.ts proxies /api to the backend.

docker-compose.yml

@@ -7,7 +7,7 @@ import {
   endpoints,
 } from "./endpoints";
 
-// Use empty string for relative URLs - all API calls will be relative to current domain
+// Empty baseURL so API calls are relative to current origin; one image works for both sandbox and production.
 const baseURL = "";
 
 export const publicApi = axios.create({ baseURL });
@@ -306,6 +306,17 @@ const sendAssistantMessage = async (
   }
 };
 
+export interface VersionResponse {
+  version: string;
+}
+
+const fetchVersion = async (): Promise<VersionResponse> => {
+  const response = await publicApi.get<VersionResponse>(
+    V1_API_ENDPOINTS.VERSION,
+  );
+  return response.data;
+};
+
 export {
   handleSubmitFeedback,
   handleSendDrugSummary,
@@ -320,4 +331,5 @@ export {
   handleSendDrugSummaryStreamLegacy,
   fetchRiskDataWithSources,
   sendAssistantMessage,
+  fetchVersion,
 };