Skip to content

UI Library for Design Engineers. Animated components and effects you can copy and paste into your apps. Free. Open Source.

feat: dockerfile fix

Dillion Vermaa12a6ed45b6f
diff --git a/dev.Dockerfile b/dev.Dockerfile
index 145a2254..cdc028b4 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -31,8 +31,6 @@ COPY next.config.js .
COPY tsconfig.json .
RUN npx prisma generate
-RUN npx prisma db push
-
# Next.js collects completely anonymous telemetry data about general usage. Learn more here: https://nextjs.org/telemetry
# Uncomment the following line to disable telemetry at run time
diff --git a/docker-compose.yml b/docker-compose.yml
index 0b2bc9f8..6d1c78f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,35 +8,35 @@ version: "3.7"
# https://github.com/vercel/next.js/blob/canary/examples/with-docker-compose/docker-compose.dev.yml
services:
- web:
+ app:
+ container_name: app
build:
context: .
dockerfile: dev.Dockerfile
volumes:
- - ./src:/app/src
- - ./public:/app/public
+ - .:/app
+ - /app/node_modules
+ - /app/.next
ports:
- - "3000:3003"
- environment:
- - DATABASE_URL=postgres://postgres:postgres@localhost:5432/postgres
+ - "3000:3000"
+ environment:
+ - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@database:${POSTGRES_PORT}/${POSTGRES_DB}
env_file:
- .env.local
restart: always
+ depends_on:
+ - database
-
database:
+ container_name: database
restart: unless-stopped
image: postgres:latest
volumes:
- database_data:/var/lib/postgresql/data
- environment:
- - POSTGRES_DB=postgres
- - POSTGRES_USER=postgres
- - POSTGRES_PASSWORD=postgres
env_file:
- .env.local
ports:
- - "5432:5432"
+ - "${POSTGRES_PORT}:5432"
volumes:
database_data:
diff --git a/package.json b/package.json
index 937f53be..e771d60f 100644
--- a/package.json
+++ b/package.json
@@ -9,16 +9,15 @@
"build": "next build",
"start": "next start",
"lint": "next lint",
- "dx": "run-s db:up db:migrate dev",
- "db:migrate": "npx prisma db push",
- "db:seed": "npx prisma db seed",
+ "dx": "run-s db:up db:migrate db:logs",
+ "db:logs": "docker compose logs -t -f || docker-compose logs -t -f",
+ "db:migrate": "dotenv -e .env.local -- npx prisma db push",
+ "db:seed": "dotenv -e .env.local -- npx tsx prisma/seed.ts",
+ "db:reset": "dotenv -e .env.local -- npx prisma migrate reset",
"db:nuke": "docker compose down --volumes --remove-orphans || docker-compose down --volumes --remove-orphans",
- "db:up": "docker compose up -d || docker-compose up -d",
+ "db:up": "docker compose --env-file .env.local up -d --force-recreate|| docker-compose --env-file .env.local up -d --force-recreate",
"dev:email": "email dev -p 3004",
"dev:stripe": "stripe listen --forward-to localhost:3003/api/webhooks/stripe",
- "dev:migrate": "dotenv -e .env.local -- npx prisma db push",
- "dev:reset": "dotenv -e .env.local -- npx prisma migrate reset",
- "dev:seed": "npx tsx prisma/seed.ts",
"prod:migrate": "dotenv -e .env -- npx prisma db push",
"prod:seed": "dotenv -e .env -- npx tsx prisma/seed.ts"
},