From 39b579ea4efd1970634122faf5d92c77130c4251 Mon Sep 17 00:00:00 2001 From: Andreas Knuth Date: Sun, 9 Nov 2025 16:10:49 -0600 Subject: [PATCH] docker compose --- bizmatch-server/docker-compose.yml | 26 ++++++++----------- bizmatch-server/src/drizzle/drizzle.module.ts | 12 ++++----- bizmatch/proxy.conf.json | 2 +- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/bizmatch-server/docker-compose.yml b/bizmatch-server/docker-compose.yml index bf91300..cc2678d 100644 --- a/bizmatch-server/docker-compose.yml +++ b/bizmatch-server/docker-compose.yml @@ -2,38 +2,34 @@ services: app: image: node:22-alpine - container_name: bizmatch-app-prod + container_name: bizmatch-app working_dir: /app volumes: - ./:/app # Code liegt hier direkt im Ordner der Compose ports: - '3001:3000' # Host 3001 -> Container 3000 env_file: - - path: ./env.prod + - path: ./.env required: true environment: - NODE_ENV=development # Prod-Modus (vorher stand fälschlich "development") - - DB_HOST=postgres-prod - - DB_PORT=5432 - - DB_NAME=${POSTGRES_DB} - - DB_USER=${POSTGRES_USER} - - DB_PASSWORD=${POSTGRES_PASSWORD} + - DATABASE_URL # Hinweis: npm ci nutzt package-lock.json; falls nicht vorhanden, nimm "npm install" command: sh -c "npm ci && npm run build && node dist/src/main.js" restart: unless-stopped depends_on: - - postgres-prod + - postgres networks: - - bizmatch-prod + - bizmatch - postgres-prod: - container_name: bizmatchdb-prod + postgres: + container_name: bizmatchdb image: postgres:17-alpine # Version pinnen ist stabiler als "latest" restart: unless-stopped volumes: - - ./bizmatchdb-data-prod:/var/lib/postgresql/data # Daten liegen im Server-Repo + - ${PWD}/bizmatchdb-data:/var/lib/postgresql/data # Daten liegen im Server-Repo env_file: - - path: ./env.prod + - path: ./.env required: true environment: POSTGRES_DB: ${POSTGRES_DB} @@ -42,8 +38,8 @@ services: ports: - '5433:5432' # Host 5433 -> Container 5432 networks: - - bizmatch-prod + - bizmatch networks: - bizmatch-prod: + bizmatch: external: true # einmalig anlegen: docker network create bizmatch-prod diff --git a/bizmatch-server/src/drizzle/drizzle.module.ts b/bizmatch-server/src/drizzle/drizzle.module.ts index 9aa2803..f21b7d5 100644 --- a/bizmatch-server/src/drizzle/drizzle.module.ts +++ b/bizmatch-server/src/drizzle/drizzle.module.ts @@ -16,13 +16,13 @@ const { Pool } = pkg; inject: [ConfigService, WINSTON_MODULE_PROVIDER, ClsService], useFactory: async (configService: ConfigService, logger: Logger, cls: ClsService) => { const connectionString = configService.get('DATABASE_URL'); - const dbHost = configService.get('DB_HOST'); - const dbPort = configService.get('DB_PORT'); - const dbName = configService.get('DB_NAME'); - const dbUser = configService.get('DB_USER'); + // const dbHost = configService.get('DB_HOST'); + // const dbPort = configService.get('DB_PORT'); + // const dbName = configService.get('DB_NAME'); + // const dbUser = configService.get('DB_USER'); const dbPassword = configService.get('DB_PASSWORD'); - logger.info(`Drizzle Connection - URL: ${connectionString}, Host: ${dbHost}, Port: ${dbPort}, DB: ${dbName}, User: ${dbUser}`); - console.log(`---> Drizzle Connection - URL: ${connectionString}, Host: ${dbHost}, Port: ${dbPort}, DB: ${dbName}, User: ${dbUser}`); + // logger.info(`Drizzle Connection - URL: ${connectionString}, Host: ${dbHost}, Port: ${dbPort}, DB: ${dbName}, User: ${dbUser}`); + // console.log(`---> Drizzle Connection - URL: ${connectionString}, Host: ${dbHost}, Port: ${dbPort}, DB: ${dbName}, User: ${dbUser}`); const pool = new Pool({ connectionString, // ssl: true, // Falls benötigt diff --git a/bizmatch/proxy.conf.json b/bizmatch/proxy.conf.json index 4fc2167..3510e6e 100644 --- a/bizmatch/proxy.conf.json +++ b/bizmatch/proxy.conf.json @@ -1,6 +1,6 @@ { "/bizmatch": { - "target": "http://localhost:3000", + "target": "http://localhost:3001", "secure": false, "changeOrigin": true, "logLevel": "debug"