diff --git a/backend/.env b/backend/.env index d5f4c50..07867d3 100644 --- a/backend/.env +++ b/backend/.env @@ -2,7 +2,7 @@ NODE_ENV=production POSTGRES_USER=root POSTGRES_PASSWORD=irina76 POSTGRES_DB=imk_db -DATABASE_URL="postgresql://root:irina76@postgres:5432/imk_db?schema=public" +DATABASE_URL="postgresql://postgres:postgres:5432/imk_db?schema=public" API_URL="https://imkapi.oblak.solutions" CORS_ORIGIN="[http://localhost:5173,https://www.placebo.mk,https://placebo.mk]" diff --git a/backend/Dockerfile b/backend/Dockerfile index 68223f1..54b8c6e 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -21,6 +21,7 @@ COPY prisma ./prisma/ # Generate Prisma client RUN npx prisma generate +RUN npx prisma migrate deploy # Copy source code COPY . . diff --git a/docker-compose.yml b/docker-compose.yml index 867f672..f725ab6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,23 +8,22 @@ 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: - NODE_ENV=${NODE_ENV} - API_URL=${API_URL} - CORS_ORIGIN=${CORS_ORIGIN} - - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}s:5432/${POSTGRES_DB} - - JWT_SECRET=${JWT_SECRET} + - DATABASE_URL=${DATABASE_URL} - SMTP_HOST=${SMTP_HOST} - SMTP_PORT=${SMTP_PORT} - SMTP_USER=${SMTP_USER}