diff --git a/.dockerignore b/.dockerignore index 0a9c8b0..54ddca9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,3 +7,4 @@ node_modules .env.* docker-compose.yml Dockerfile +mysql_data diff --git a/.env b/.env deleted file mode 100644 index d60d692..0000000 --- a/.env +++ /dev/null @@ -1,7 +0,0 @@ -DB_TYPE=mysql -DB_HOST=zero-db.naiv.dev -DB_PORT=23306 -DB_NAME=db_a41dfa3bd96242409d2a3565939d2be4 -DB_USERNAME=uname_50a1caca5d7441ad9f6fce806a -DB_PASSWORD=pwd_6c60547f55af41f58b0f2b2a54054a4c -DATABASE_URL="mysql://uname_50a1caca5d7441ad9f6fce806a:pwd_6c60547f55af41f58b0f2b2a54054a4c@zero-db.naiv.dev:23306/db_a41dfa3bd96242409d2a3565939d2be4" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0008ac8..f449f04 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ yarn-error.log* next-env.d.ts /src/generated/prisma +mysql_data \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 87ebe8c..7a05c21 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,10 +9,8 @@ services: MYSQL_DATABASE: travel_antarkota MYSQL_USER: travel_user MYSQL_PASSWORD: travel_password - ports: - - "3306:3306" volumes: - - mysql_data:/var/lib/mysql + - ./mysql_data:/var/lib/mysql healthcheck: test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-prootpassword"] interval: 5s @@ -24,7 +22,7 @@ services: container_name: travel-app restart: unless-stopped ports: - - "3000:3000" + - "${HOST_PORT:-3000}:3000" environment: # Database DB_TYPE: mysql @@ -44,6 +42,3 @@ services: depends_on: mysql: condition: service_healthy - -volumes: - mysql_data: diff --git a/prisma.config.ts b/prisma.config.ts index d1d83e2..22097f2 100644 --- a/prisma.config.ts +++ b/prisma.config.ts @@ -1,7 +1,4 @@ -// This file was generated by Prisma, and assumes you have installed the following: -// npm install --save-dev prisma dotenv -import dotenv from "dotenv"; -dotenv.config({ override: true }); +// Prisma v7 config — DB URL is injected via docker-compose environment variables import { defineConfig } from "prisma/config"; export default defineConfig({