Merge branch 'main' into husky

Dockerfile.dev

@@ -2,14 +2,15 @@ FROM node:20-alpine
 
 WORKDIR /usr/src/app
 
-COPY package.json package-lock.json ./
+COPY package.json pnpm-lock.yaml ./
 COPY prisma ./prisma
 
-RUN  npm install
+RUN npm i pnpm -g
+
+RUN pnpm install
 
 COPY . .
 
 EXPOSE 3000
 
-CMD ["npm", "run", "dev:docker"]
-
+CMD ["pnpm", "dev:docker"]

Dockerfile.prod

@@ -1,14 +1,31 @@
-FROM node:20-alpine
-ARG DATABASE_URL
+FROM node:20-alpine AS build
 
 WORKDIR /usr/src/app
+ARG DATABASE_URL 
 
 COPY . .
 
-RUN npm install
-RUN DATABASE_URL=$DATABASE_URL npx prisma generate
-RUN DATABASE_URL=$DATABASE_URL npm run build
+RUN npm install -g pnpm && \
+  pnpm install && \
+  pnpm add sharp && \
+  pnpm run build && \
+  DATABASE_URL=$DATABASE_URL pnpm dlx prisma generate 
 
-EXPOSE 3000
 
-CMD ["npm", "run", "start"]
+
+FROM node:20-alpine AS run
+
+RUN mkdir /.npm && chown -R 1001:1001 /.npm
+
+USER 1001:1001
+WORKDIR /usr/src/app
+
+COPY --from=build --chown=1001:1001 usr/src/app/.next/standalone ./
+COPY --from=build --chown=1001:1001 usr/src/app/.next/static ./.next/static
+COPY --from=build --chown=1001:1001 usr/src/app/public ./public
+
+ENV NODE_ENV production
+ENV PORT 3000 
+ENV HOSTNAME "0.0.0.0"
+
+CMD [ "node", "server.js" ]

docker-compose.yml

@@ -1,7 +1,10 @@
-version: '3.5'
 services:
   app:
-    build: .
+    build:
+      context: .
+      dockerfile: Dockerfile.dev
+      args:
+        - DATABASE_URL=postgresql://postgres:postgres@db:5432/cms?schema=public
     container_name: cms-docker
     environment:
       - DATABASE_URL=postgresql://postgres:postgres@db:5432/cms?schema=public
@@ -10,15 +13,15 @@ services:
       - '3000:3000'
       - '5555:5555'
     volumes:
-      - .:/usr/src/app
+      # - .:/usr/src/app
       - /usr/src/app/.next
       - /usr/src/app/node_modules
     depends_on:
       db:
         condition: service_healthy
 
   db:
-    image: postgres:9.6
+    image: postgres:alpine
     container_name: db
     restart: always
     environment:
@@ -36,4 +39,4 @@ services:
       retries: 5
 
 volumes:
-  postgres-data: 
+  postgres-data:

next.config.js

@@ -31,6 +31,7 @@ const nextConfig = {
     }
     return config;
   },
+  output: 'standalone',
 };
 
 module.exports = nextConfig;

package.json

@@ -56,6 +56,7 @@
     "@tabler/icons-react": "^3.14.0",
     "@types/bcrypt": "^5.0.2",
     "@types/jsonwebtoken": "^9.0.5",
+    "@uiw/react-markdown-preview": "^5.1.3",
     "@uiw/react-md-editor": "^4.0.4",
     "axios": "^1.6.2",
     "bcrypt": "^5.1.1",
@@ -71,6 +72,7 @@
     "ioredis": "^5.4.1",
     "jose": "^5.2.2",
     "jsonwebtoken": "^9.0.2",
+    "katex": "^0.16.11",
     "lucide-react": "^0.321.0",
     "moment": "^2.30.1",
     "next": "14.0.2",
@@ -80,6 +82,7 @@
     "node-fetch": "^3.3.2",
     "notion-client": "^6.16.0",
     "pdf-lib": "^1.17.1",
+    "prismjs": "^1.29.0",
     "qs": "^6.13.0",
     "react": "^18",
     "react-big-calendar": "^1.13.2",