From c5172d0e4fe1a3d7f66a9db0416134487f714147 Mon Sep 17 00:00:00 2001 From: dimitar Date: Mon, 31 Mar 2025 13:52:59 +0200 Subject: [PATCH] clean up docker compose --- .env | 5 ++++- backend/docker-compose.yml | 20 ++++++++++---------- docker-compose.yml | 18 +++++++++--------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.env b/.env index 067b58d..8f74631 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ +NODE_ENV=production POSTGRES_USER=root POSTGRES_PASSWORD=irina76 POSTGRES_DB=imk_db @@ -6,7 +7,9 @@ DATABASE_URL="postgresql://postgres:postgres@postgres:5432/imk_db?schema=public" REDIS_PASSWORD=somerandompassword API_URL="https://imkapi.oblak.solutions" -CORS_ORIGIN="[http://localhost:5173,https://www.placebo.mk,https://placebo.mk]" +FRONTEND_URL=https://placebo.mk + +CORS_ORIGIN=http://localhost:5173,https://www.placebo.mk,https://placebo.mk JWT_SECRET=some-secret AWS_REGION=EU2 diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml index 9be1ce3..0c8cd71 100644 --- a/backend/docker-compose.yml +++ b/backend/docker-compose.yml @@ -7,16 +7,16 @@ services: context: ./backend dockerfile: Dockerfile args: - # - NODE_ENV=${NODE_ENV} - - API_URL=${API_URL} - - CORS_ORIGIN=${CORS_ORIGIN} - - DATABASE_URL=${DATABASE_URL} - - JWT_SECRET=${JWT_SECRET} - - SMTP_HOST=${SMTP_HOST} - - SMTP_PORT=${SMTP_PORT} - - SMTP_USER=${SMTP_USER} - - SMTP_PASS=${SMTP_PASS} - - EMAIL_FROM=${EMAIL_FROM} + - NODE_ENV=${NODE_ENV} + # - API_URL=${API_URL} + # - CORS_ORIGIN=${CORS_ORIGIN} + # - DATABASE_URL=${DATABASE_URL} + # - JWT_SECRET=${JWT_SECRET} + # - SMTP_HOST=${SMTP_HOST} + # - SMTP_PORT=${SMTP_PORT} + # - SMTP_USER=${SMTP_USER} + # - SMTP_PASS=${SMTP_PASS} + # - EMAIL_FROM=${EMAIL_FROM} ports: - "3000:3000" environment: diff --git a/docker-compose.yml b/docker-compose.yml index 73285d7..42bf4bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,15 +8,15 @@ services: dockerfile: Dockerfile args: - NODE_ENV=${NODE_ENV} - - API_URL=${API_URL} - - CORS_ORIGIN=${CORS_ORIGIN} - - DATABASE_URL=${DATABASE_URL} - - JWT_SECRET=${JWT_SECRET} - - SMTP_HOST=${SMTP_HOST} - - SMTP_PORT=${SMTP_PORT} - - SMTP_USER=${SMTP_USER} - - SMTP_PASS=${SMTP_PASS} - - EMAIL_FROM=${EMAIL_FROM} + # - API_URL=${API_URL} + # - CORS_ORIGIN=${CORS_ORIGIN} + # - DATABASE_URL=${DATABASE_URL} + # - JWT_SECRET=${JWT_SECRET} + # - SMTP_HOST=${SMTP_HOST} + # - SMTP_PORT=${SMTP_PORT} + # - SMTP_USER=${SMTP_USER} + # - SMTP_PASS=${SMTP_PASS} + # - EMAIL_FROM=${EMAIL_FROM} ports: - "3000:3000" environment: