From d10b7efed9d4e57367c5a10d802f29724c2b0d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=BChl?= Date: Mon, 21 Apr 2025 21:49:03 +0200 Subject: [PATCH] backend fixes --- backend/.dockerignore | 1 - backend/Dockerfile | 2 +- backend/docker-compose.yml | 16 +++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/backend/.dockerignore b/backend/.dockerignore index 07fb6db..67d713f 100644 --- a/backend/.dockerignore +++ b/backend/.dockerignore @@ -1,4 +1,3 @@ .idea node_modules npm-debug.log -.env.* diff --git a/backend/Dockerfile b/backend/Dockerfile index ccc7199..512c179 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -24,7 +24,7 @@ RUN --mount=type=bind,source=package.json,target=package.json \ npm ci --include=dev USER node COPY . . -CMD ["npm", "run", "dev"] +CMD ["npm", "run", "start:dev"] #FROM node:20-alpine as build diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml index 09b4703..98c7684 100644 --- a/backend/docker-compose.yml +++ b/backend/docker-compose.yml @@ -6,11 +6,13 @@ services: secrets: - db-password environment: - POSTGRES_DB: bullpen-prod - POSTGRES_USER: test + POSTGRES_DB: ${DB_NAME} + POSTGRES_USER: ${DB_USER} POSTGRES_PASSWORD_FILE: /run/secrets/db-password expose: - 5432 + ports: + - "15432:5432" volumes: - db_data:/var/lib/postgresql/data healthcheck: @@ -29,12 +31,12 @@ services: - "8124:8080" container_name: bullpen environment: - NODE_ENV: production - POSTGRES_HOST: db - POSTGRES_USER: test + NODE_ENV: development + POSTGRES_HOST: ${DB_HOST} + POSTGRES_USER: ${DB_USER} POSTGRES_PASSWORD_FILE: /run/secrets/db-password - POSTGRES_DB: bullpen-prod - POSTGRES_PORT: 5432 + POSTGRES_DB: ${DB_NAME} + POSTGRES_PORT: ${DB_PORT} secrets: - db-password volumes: