Fix GitHub Actions deployment setup

Author: Shikhar-395

.github/workflows/cd.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_PREFIX: ${{ vars.IMAGE_PREFIX || format('ghcr.io/{0}/exchange', github.repository_owner) }}
+  IMAGE_PREFIX: ${{ vars.IMAGE_PREFIX || 'ghcr.io/shikhar-395/exchange' }}
   PUBLIC_API_URL: ${{ vars.NEXT_PUBLIC_EXCHANGE_API_URL || 'https://api.exchange.shikhar.site/api/v1' }}
   PUBLIC_WS_URL: ${{ vars.NEXT_PUBLIC_EXCHANGE_WS_URL || 'wss://ws.exchange.shikhar.site' }}
 

apps/integration-test/src/scripts/run-integration-ci.sh

@@ -7,36 +7,68 @@ PORT=3001
 
 function stop_services() {
   echo "🔴 - Stopping backend..."
-  kill $(lsof -t -i:$PORT)
+  if [ -n "${BACKEND_PID:-}" ]; then
+    kill "$BACKEND_PID" 2>/dev/null || true
+  fi
 
   echo "🔴 - Taking down auxiliary services..."
   docker compose -f "$PROJECT_ROOT/docker/compose-files/docker-compose-integration-test.yml" down
 }
 
 trap stop_services EXIT INT TERM
 
-DATABASE_URL="${DATABASE_URL:-postgresql://postgres:password@localhost:5432/postgres}"
+DATABASE_URL="${CI_DATABASE_URL:-postgresql://postgres:password@localhost:5432/postgres}"
+TIMESCALE_URL_PASSWORD="${TIMESCALE_PASSWORD:-password}"
 
 echo "Starting auxilary services"
 docker compose -f "$PROJECT_ROOT/docker/compose-files/docker-compose-integration-test.yml" up -d --wait
 
 echo '🟡 - Waiting for database to be ready...'
-$PROJECT_ROOT/apps/integration-test/src/scripts/wait-for-it.sh localhost:5432 -- echo "database has started"
+$PROJECT_ROOT/apps/integration-test/src/scripts/wait-for-it.sh localhost:5432 --timeout=60 -- echo "database has started"
 
 echo "Applying migration"
-cd $PROJECT_ROOT/packages/database && DATABASE_URL="$DATABASE_URL" pnpm dlx prisma migrate dev --name init --schema "$PROJECT_ROOT/packages/database/prisma/schema.prisma"
+cd $PROJECT_ROOT/packages/database && DATABASE_URL="$DATABASE_URL" DIRECT_URL="$DATABASE_URL" pnpm dlx prisma migrate dev --name init --schema "$PROJECT_ROOT/packages/database/prisma/schema.prisma"
 
 echo "Generate Client"
 cd $PROJECT_ROOT/packages/database && pnpm dlx prisma generate --schema "$PROJECT_ROOT/packages/database/prisma/schema.prisma"
 
+cat > "$PROJECT_ROOT/apps/backend/.env" <<EOF
+PORT=$PORT
+DATABASE_URL=$DATABASE_URL
+DIRECT_URL=$DATABASE_URL
+REDIS_URL=redis://localhost:6379
+TIMESCALE_USER=exchange
+TIMESCALE_HOST=localhost
+TIMESCALE_DATABASE=exchange
+TIMESCALE_PASSWORD=$TIMESCALE_URL_PASSWORD
+TIMESCALE_PORT=5433
+FRONTEND_URL_DEPLOYED=http://localhost:3000
+BETTER_AUTH_SECRET=test-secret
+BETTER_AUTH_URL=http://localhost:$PORT
+EOF
+
+cat > "$PROJECT_ROOT/apps/db-processor/.env" <<EOF
+DATABASE_URL=$DATABASE_URL
+DIRECT_URL=$DATABASE_URL
+REDIS_URL=redis://localhost:6379
+TIMESCALE_USER=exchange
+TIMESCALE_HOST=localhost
+TIMESCALE_DATABASE=exchange
+TIMESCALE_PASSWORD=$TIMESCALE_URL_PASSWORD
+TIMESCALE_PORT=5433
+EOF
+
+echo "Initializing TimescaleDB"
+cd $PROJECT_ROOT/apps/db-processor && pnpm run seed
+
 echo '🟡 - Starting backend server...'
 cd $PROJECT_ROOT/apps/backend && PORT=$PORT pnpm run dev:ci &
 BACKEND_PID=$!
 
 echo "backend pid $BACKEND_PID"
 
 echo '🟡 - Waiting for backend to be ready...'
-$PROJECT_ROOT/apps/integration-test/src/scripts/wait-for-it.sh localhost:3001 -- echo "backend has started"
+$PROJECT_ROOT/apps/integration-test/src/scripts/wait-for-it.sh localhost:3001 --timeout=60 -- echo "backend has started"
 
 echo "Run integration test"
 cd $PROJECT_ROOT/apps/integration-test && vitest --run

apps/integration-test/src/scripts/wait-for-it.sh

@@ -137,8 +137,10 @@ WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
 WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
 
 # Check to see if timeout is from busybox?
-WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
-WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout || true)
+if [[ -n "$WAITFORIT_TIMEOUT_PATH" ]]; then
+  WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+fi
 
 WAITFORIT_BUSYTIMEFLAG=""
 if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
@@ -157,7 +159,7 @@ if [[ $WAITFORIT_CHILD -gt 0 ]]; then
   WAITFORIT_RESULT=$?
   exit $WAITFORIT_RESULT
 else
-  if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+  if [[ $WAITFORIT_TIMEOUT -gt 0 && -n "$WAITFORIT_TIMEOUT_PATH" ]]; then
     wait_for_wrapper
     WAITFORIT_RESULT=$?
   else

docker/compose-files/docker-compose-deploy.yml

@@ -32,7 +32,7 @@ services:
       retries: 10
 
   backend:
-    image: ${IMAGE_PREFIX:-ghcr.io/shikhar/exchange}/backend:${IMAGE_TAG:-latest}
+    image: ${IMAGE_PREFIX:-ghcr.io/shikhar-395/exchange}/backend:${IMAGE_TAG:-latest}
     container_name: backend
     restart: always
     ports:
@@ -46,7 +46,7 @@ services:
         condition: service_healthy
 
   engine:
-    image: ${IMAGE_PREFIX:-ghcr.io/shikhar/exchange}/engine:${IMAGE_TAG:-latest}
+    image: ${IMAGE_PREFIX:-ghcr.io/shikhar-395/exchange}/engine:${IMAGE_TAG:-latest}
     container_name: engine
     restart: always
     env_file:
@@ -58,7 +58,7 @@ services:
         condition: service_healthy
 
   db-processor:
-    image: ${IMAGE_PREFIX:-ghcr.io/shikhar/exchange}/db-processor:${IMAGE_TAG:-latest}
+    image: ${IMAGE_PREFIX:-ghcr.io/shikhar-395/exchange}/db-processor:${IMAGE_TAG:-latest}
     container_name: db-processor
     restart: always
     env_file:
@@ -70,7 +70,7 @@ services:
         condition: service_healthy
 
   websocket:
-    image: ${IMAGE_PREFIX:-ghcr.io/shikhar/exchange}/websocket:${IMAGE_TAG:-latest}
+    image: ${IMAGE_PREFIX:-ghcr.io/shikhar-395/exchange}/websocket:${IMAGE_TAG:-latest}
     container_name: websocket
     restart: always
     ports:
@@ -82,7 +82,7 @@ services:
         condition: service_healthy
 
   market-maker:
-    image: ${IMAGE_PREFIX:-ghcr.io/shikhar/exchange}/market-maker:${IMAGE_TAG:-latest}
+    image: ${IMAGE_PREFIX:-ghcr.io/shikhar-395/exchange}/market-maker:${IMAGE_TAG:-latest}
     container_name: market-maker
     restart: always
     env_file:
@@ -91,7 +91,7 @@ services:
       - backend
 
   web:
-    image: ${IMAGE_PREFIX:-ghcr.io/shikhar/exchange}/web:${IMAGE_TAG:-latest}
+    image: ${IMAGE_PREFIX:-ghcr.io/shikhar-395/exchange}/web:${IMAGE_TAG:-latest}
     container_name: web
     restart: always
     ports:

docker/compose-files/docker-compose-integration-test.yml

@@ -12,3 +12,29 @@ services:
       interval: 1s
       timeout: 10s
       retries: 10 
+
+  redis:
+    image: redis
+    container_name: redis
+    ports:
+      - '6379:6379'
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 1s
+      timeout: 10s
+      retries: 10
+
+  timescaledb:
+    image: timescale/timescaledb:latest-pg12
+    container_name: timescaledb
+    ports:
+      - "5433:5432"
+    environment:
+      POSTGRES_DB: exchange
+      POSTGRES_USER: exchange
+      POSTGRES_PASSWORD: password
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U exchange -d exchange"]
+      interval: 1s
+      timeout: 10s
+      retries: 10