From 193aeae8349f77c3307c5e11b2edd6f8446513ec Mon Sep 17 00:00:00 2001 From: root Date: Mon, 11 May 2026 17:18:27 -0400 Subject: [PATCH] fix packeg for dev and prod --- DOCKER.md | 18 +++++++++--------- apps/admin/package.json | 3 +++ apps/api/package.json | 3 +++ apps/dashboard/package.json | 3 +++ apps/marketplace/package.json | 3 +++ apps/public-site/package.json | 3 +++ command_to_run_dev.txt | 7 +++---- docker-compose.dev.yml | 2 ++ docker-compose.production.yml | 2 ++ package.json | 4 ++++ 10 files changed, 35 insertions(+), 13 deletions(-) diff --git a/DOCKER.md b/DOCKER.md index b3ddfa9..3aa06ac 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -164,7 +164,7 @@ docker compose -f traefik.yaml up -d #### 6. Build and start the app stack ```bash -docker compose -f docker-compose.production.yml up --build -d +npm run docker:prod:up ``` Docker will: @@ -180,41 +180,41 @@ Pull the latest code and rebuild only the changed service: ```bash git pull -docker compose -f docker-compose.production.yml up --build -d --no-deps +docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d --no-deps # e.g. to redeploy only the API: -docker compose -f docker-compose.production.yml up --build -d --no-deps api +docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d --no-deps api ``` To rebuild everything: ```bash -docker compose -f docker-compose.production.yml up --build -d +npm run docker:prod:up ``` #### Apply database migrations without downtime ```bash -docker compose -f docker-compose.production.yml run --rm migrate +docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml run --rm api npm run db:deploy ``` #### View logs ```bash # All services -docker compose -f docker-compose.production.yml logs -f +npm run docker:prod:logs # Single service -docker compose -f docker-compose.production.yml logs -f api +npm run docker:prod:logs:api ``` #### Stop the stack ```bash # Stop containers but keep volumes (data is preserved) -docker compose -f docker-compose.production.yml down +npm run docker:prod:down # Stop and delete all data (destructive — irreversible) -docker compose -f docker-compose.production.yml down -v +docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml down -v ``` #### pgManage (DB admin UI) diff --git a/apps/admin/package.json b/apps/admin/package.json index c125d36..80668f9 100644 --- a/apps/admin/package.json +++ b/apps/admin/package.json @@ -3,8 +3,11 @@ "version": "1.0.0", "private": true, "scripts": { + "predev": "npm run build --workspace @rentaldrivego/types", "dev": "next dev -p 3002", + "prebuild": "npm run build --workspace @rentaldrivego/types", "build": "next build", + "prestart": "npm run build --workspace @rentaldrivego/types", "start": "next start -p 3002", "type-check": "tsc --noEmit" }, diff --git a/apps/api/package.json b/apps/api/package.json index cda46ec..9b6d4fa 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -3,8 +3,11 @@ "version": "1.0.0", "private": true, "scripts": { + "predev": "npm run build --workspace @rentaldrivego/types", "dev": "node --env-file=../../.env.local ../../node_modules/.bin/ts-node-dev --respawn --transpile-only src/index.ts", + "prebuild": "npm run build --workspace @rentaldrivego/types", "build": "tsc", + "prestart": "npm run build --workspace @rentaldrivego/types", "start": "node dist/index.js", "type-check": "tsc --noEmit" }, diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json index 0e61d74..2cae28e 100644 --- a/apps/dashboard/package.json +++ b/apps/dashboard/package.json @@ -3,8 +3,11 @@ "version": "1.0.0", "private": true, "scripts": { + "predev": "npm run build --workspace @rentaldrivego/types", "dev": "next dev -p 3001", + "prebuild": "npm run build --workspace @rentaldrivego/types", "build": "next build", + "prestart": "npm run build --workspace @rentaldrivego/types", "start": "next start -p 3001", "type-check": "tsc --noEmit" }, diff --git a/apps/marketplace/package.json b/apps/marketplace/package.json index b3ad3e5..8a759c5 100644 --- a/apps/marketplace/package.json +++ b/apps/marketplace/package.json @@ -3,8 +3,11 @@ "version": "1.0.0", "private": true, "scripts": { + "predev": "npm run build --workspace @rentaldrivego/types", "dev": "next dev -p 3000", + "prebuild": "npm run build --workspace @rentaldrivego/types", "build": "next build", + "prestart": "npm run build --workspace @rentaldrivego/types", "start": "next start -p 3000", "type-check": "tsc --noEmit" }, diff --git a/apps/public-site/package.json b/apps/public-site/package.json index b14d317..722e52a 100644 --- a/apps/public-site/package.json +++ b/apps/public-site/package.json @@ -3,8 +3,11 @@ "version": "1.0.0", "private": true, "scripts": { + "predev": "npm run build --workspace @rentaldrivego/types", "dev": "next dev -p 3003", + "prebuild": "npm run build --workspace @rentaldrivego/types", "build": "next build", + "prestart": "npm run build --workspace @rentaldrivego/types", "start": "next start -p 3003", "type-check": "tsc --noEmit" }, diff --git a/command_to_run_dev.txt b/command_to_run_dev.txt index 2cba21f..dd97eea 100644 --- a/command_to_run_dev.txt +++ b/command_to_run_dev.txt @@ -1,7 +1,7 @@ docker compose -f docker-compose.dev.yml up -d postgres docker compose -f docker-compose.dev.yml up -d redis -docker compose -f docker-compose.production.yml up --build -d --no-deps marketplace -docker compose -f docker-compose.production.yml up --build -d --no-deps admin +docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d --no-deps marketplace +docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d --no-deps admin docker compose -f docker-compose.dev.yml --profile full up --build docker compose -f docker-compose.dev.yml --profile dashboard up --build docker compose -f docker-compose.dev.yml --profile marketplace up --build @@ -43,6 +43,5 @@ cp .env.docker.production.example .env.docker.production # Deploy docker compose -f traefik.yaml up -d -docker compose -f docker-compose.production.yml up --build -d - +docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index a8ce245..3560503 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,3 +1,5 @@ +name: rentaldrivego-dev + services: postgres: image: postgres:16-alpine diff --git a/docker-compose.production.yml b/docker-compose.production.yml index c844af4..f3a2eb7 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,3 +1,5 @@ +name: rentaldrivego-prod + services: postgres: image: postgres:16-alpine diff --git a/package.json b/package.json index db7b82c..fce6a5a 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,10 @@ "dev": "turbo dev", "lint": "turbo lint", "type-check": "turbo type-check", + "docker:prod:up": "docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml up --build -d", + "docker:prod:down": "docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml down", + "docker:prod:logs": "docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml logs -f", + "docker:prod:logs:api": "docker compose -p rentaldrivego-prod --env-file .env.docker.production -f docker-compose.production.yml logs -f api", "clerk:keys": "bash scripts/setup-clerk-keys.sh", "db:generate": "turbo db:generate", "db:deploy": "node packages/database/scripts/db-deploy.cjs",