modify pipeline to speed up deployment

2026-08-26 18:42:49 +00:00 · 2026-05-28 12:52:56 +03:00
parent 671d24b81d
commit 342ccb63de
23 changed files with 561 additions and 672 deletions
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ pnpm --filter @edr/passenger-api run prisma:generate

 #### Run Migrations
 ```bash
-pnpm --filter @edr/passenger-api run prisma:migrate
+pnpm --filter @edr/passenger-api run prisma:migrate:dev
 ```

 #### Seed Database
@@ -523,59 +523,103 @@ pnpm --filter @edr/passenger-api run type-check   # TypeScript check

 # Database
 pnpm --filter @edr/passenger-api run prisma:generate  # Generate Prisma client
-pnpm --filter @edr/passenger-api run prisma:migrate   # Run migrations
+pnpm --filter @edr/passenger-api run prisma:migrate:dev   # Run migrations (local dev)
 pnpm --filter @edr/passenger-api run prisma:seed      # Seed database
 ```

 ## 🐳 Docker Deployment

-### Build Image
+All six apps build from Dockerfiles: each API has its own (`apps/edr-freight-api/Dockerfile`, `apps/edr-passenger-api/Dockerfile`); Vite frontends share `infrastructure/docker/Dockerfile.web` and are served with **nginx**. APIs run on **Node 22**.
+
+**Prerequisites**
+
+- Docker with BuildKit enabled
+- A local [`.npmrc`](.gitignore) with GitHub Packages auth for `@tria-plc/*` (required for **freight** API and web images)
+- External Postgres for each API (compose does **not** include databases)
+- Copy `apps/edr-freight-api/.env.example` → `.env` and `apps/edr-passenger-api/.env.example` → `.env` with real connection strings
+
+### Build and run (all apps)
+
 ```bash
 # From monorepo root
-docker build -f apps/edr-passenger-api/Dockerfile -t edr-passenger-api .
+DOCKER_BUILDKIT=1 pnpm docker:build
+pnpm docker:up
 ```

-### Run Container
+Or without pnpm scripts:
+
 ```bash
-docker run -d \
-  --name edr-api \
-  -p 4000:4000 \
-  --env-file apps/edr-passenger-api/.env \
-  edr-passenger-api
+DOCKER_BUILDKIT=1 docker compose build
+docker compose up -d
 ```

-### Docker Compose (Recommended)
-```yaml
-version: '3.8'
-services:
-  postgres:
-    image: postgres:15
-    environment:
-      POSTGRES_USER: edr
-      POSTGRES_PASSWORD: edr_secret
-      POSTGRES_DB: edr_passenger
-    ports:
-      - "5432:5432"
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
+| Service | URL (default) |
+|---------|----------------|
+| Freight API | http://localhost:3001 |
+| Passenger API | http://localhost:4000 |
+| Freight portal | http://localhost:5173 |
+| Freight backoffice | http://localhost:5183 |
+| Passenger portal | http://localhost:5174 |
+| Passenger backoffice | http://localhost:5184 |

-  api:
-    build:
-      context: .
-      dockerfile: apps/edr-passenger-api/Dockerfile
-    ports:
-      - "4000:4000"
-    environment:
-      DATABASE_URL: postgresql://edr:edr_secret@postgres:5432/edr_passenger
-      JWT_SECRET: your-secret-key
-      PORT: 4000
-    depends_on:
-      - postgres
+### Build a single service

-volumes:
-  postgres_data:
+```bash
+docker compose build freight-api
+docker compose build passenger-portal
 ```

+Freight images mount `.npmrc` as a BuildKit secret during `pnpm install`. Passenger web images do not require private packages.
+
+### `VITE_API_URL` (frontends)
+
+API URLs are **baked in at image build time** (`import.meta.env.VITE_API_URL`). Defaults in [`docker-compose.yaml`](docker-compose.yaml) use `http://localhost:3001/api` (freight) and `http://localhost:4000` (passenger) for local smoke tests. Override build args for production, e.g.:
+
+```bash
+docker compose build freight-portal \
+  --build-arg VITE_API_URL=https://freight-api.example.com/api
+```
+
+### Migrations
+
+- **Freight API:** TypeORM migrations are not run on container startup — apply them separately before deploy.
+- **Passenger API:** On each container start, the entrypoint runs `npm run prisma:migrate` and `npm run prisma:seed` (same `package.json` scripts as `pnpm run`) before starting the server. Ensure `DATABASE_URL` in `.env` points at a reachable Postgres instance.
+
+For local development, use `pnpm --filter @edr/passenger-api run prisma:migrate:dev` instead of `prisma:migrate`.
+
+### GitHub Actions (self-hosted runner)
+
+Two workflows deploy independently on push to `main`, `develop`, or `staging`:
+
+| Workflow | Services | Server env root |
+|----------|----------|-----------------|
+| [`.github/workflows/deploy-freight.yml`](.github/workflows/deploy-freight.yml) | freight-api, freight-portal, freight-backoffice | `/home/user/environmen/edr-freight/<branch>/` |
+| [`.github/workflows/deploy-passenger.yml`](.github/workflows/deploy-passenger.yml) | passenger-api, passenger-portal, passenger-backoffice | `/home/user/environmen/edr-passenger/<branch>/` |
+
+**On the runner**, place env files before the first deploy (example for branch `main`):
+
+```text
+/home/user/environmen/edr-freight/main/
+  freight-api.env
+  freight-portal.env          # optional runtime env for Vite/nginx
+  freight-backoffice.env
+  freight-web.build.env       # exports FREIGHT_VITE_API_URL=...
+
+/home/user/environmen/edr-passenger/main/
+  passenger-api.env
+  passenger-portal.env
+  passenger-backoffice.env
+  passenger-web.build.env     # exports PASSENGER_VITE_API_URL=...
+```
+
+Example `freight-web.build.env`:
+
+```bash
+export FREIGHT_VITE_API_URL=https://freight-api.example.com/api
+```
+
+The workflow copies `*.env` into each app directory, creates `.npmrc` from the `NPM_TOKEN` repository secret, then runs `docker compose build` and `docker compose up -d` for that stack.
+
 ## 🔒 Security Best Practices

 1. **Environment Variables** - Never commit `.env` files. Use secrets management in production.