refactor: update Dockerfile and docker-compose for improved structure and PostgreSQL integration

Author: willuhmjs

Dockerfile

@@ -1,14 +1,16 @@
-FROM node:22
-WORKDIR /app
-RUN npm i -g pnpm
-COPY package*.json .
-RUN pnpm i
+FROM node:slim
+
+RUN apt-get update -y \
+&& apt-get install -y openssl
+
+WORKDIR /usr/src/app
+
+COPY package.json pnpm-lock.yaml ./
+
+RUN npm install -g pnpm
+
 COPY . .
-ARG JWT_SECRET="secret"
-ARG ADMIN_LOGIN="secret"
-ENV JWT_SECRET=${JWT_SECRET}
-ENV ADMIN_LOGIN=${ADMIN_LOGIN}
-RUN pnpm npx prisma generate
-RUN pnpm build
-EXPOSE 3000
-CMD ["node", "build/index.js", "--host", "0.0.0.0"]
+
+RUN pnpm install
+
+CMD ["sh", "-c", "pnpm run db:deploy && pnpm run build && pnpm run preview --host"]

docker-compose.yaml

@@ -1,30 +1,56 @@
 services:
-  web:
-    image: docker.io/node:20.9.0-alpine3.18
-    container_name: hintable-web
+  postgres_db:
+    image: postgres:15
+    hostname: postgres_db
+    container_name: postgres_db
+    restart: always
     environment:
-      - ORIGIN=http://localhost:5173
+      POSTGRES_DB: postgres
+      POSTGRES_USER: postgres
+    env_file:
+      - .env.prod
+    ports:
+      - '5432:5432'
+    networks:
+      - prisma-network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
+      interval: 5s
+      timeout: 2s
+      retries: 20
+
+  server:
+    build: 
+      context: .  
+      dockerfile: Dockerfile
     ports:
       - '4173:4173'
+    stdin_open: true
+    tty: true  # Keeps the container running for debugging
+    depends_on:
+      postgres_db:
+        condition: service_healthy
     env_file:
-      - .env
+      - .env.prod
+    networks:
+      - prisma-network
+  prisma-studio:
+    image: node:lts-alpine3.17
+    working_dir: /usr/src/app
     volumes:
-      - ./:/app
-      - /app/node_modules/
-      - /app/.pnpm-store/
-    working_dir: /app
-    command: sh -c "npm i -g pnpm@8.12.1 && pnpm install && pnpm run db:deploy && pnpm run build && pnpm run preview --host"
-    depends_on:
-      - db
-  db:
-    image: docker.io/postgres:13
-    restart: always
-    container_name: hintable-postgres
-    environment:
-      POSTGRES_USER: user
-      POSTGRES_PASSWORD: pass
-      POSTGRES_DB: db      
+      - .:/usr/src/app
+    command: npx prisma studio --port 5555 --browser none
     ports:
-      - '5432:5432'
-    volumes:
-      - /var/lib/postgresql/data
+      - "5555:5555"
+    env_file:
+      - .env.prod
+    networks:
+      - prisma-network
+    depends_on:
+      postgres_db:
+        condition: service_healthy
+      server:
+        condition: service_started
+networks:
+  prisma-network:
+    name: prisma-network

package.json

@@ -7,7 +7,7 @@
 	},
 	"scripts": {
 		"dev": "vite dev",
-		"db:deploy": "prisma migrate deploy",
+		"db:deploy": "prisma migrate deploy && prisma generate",
 		"build": "vite build",
 		"preview": "vite preview",
 		"test": "playwright test",
@@ -17,6 +17,7 @@
 		"lint": "prettier --check . && eslint .",
 		"format": "prettier --write .",
 		"seed": "node src/seed.js"
+		
 	},
 	"devDependencies": {
 		"@fontsource-variable/montserrat": "^5.1.0",