Update dependencies and Dockerfile configurations

MuttakinHasib · Jan 5, 2024 · 52df31f · 52df31f · vercel · Jan 5, 2024
1 parent c46568b
commit 52df31f
Show file tree

Hide file tree

Showing 8 changed files with 7,529 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@
 ### dotenv ###
 .env
 .nx
-yarn.lock
 ### Linux ###
 *~
 

diff --git a/apps/admin/Dockerfile b/apps/admin/Dockerfile
@@ -29,7 +29,7 @@ RUN adduser --system --uid 1001 nextjs
 
 COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
 COPY --from=builder /app/node_modules ./node_modules
-COPY --from=builder /app/.next/package.json ./package.json
+COPY --from=builder /app/package.json ./package.json
 
 USER nextjs
 

diff --git a/apps/admin/yarn.lock b/apps/admin/yarn.lock
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -20,7 +20,6 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@colors/colors": "^1.6.0",
     "@nestjs-modules/mailer": "^1.9.1",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.1.1",
@@ -34,6 +33,7 @@
     "bcryptjs": "^2.4.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
+    "colors": "^1.4.0",
     "connect-pg-simple": "^9.0.1",
     "express-session": "^1.17.3",
     "handlebars": "^4.7.8",

diff --git a/apps/api/src/main.ts b/apps/api/src/main.ts
@@ -1,4 +1,4 @@
-import '@colors/colors';
+import 'colors';
 import { Logger, ValidationPipe } from '@nestjs/common';
 import { ConfigurationService, NestHttpExceptionFilter } from '@app/common';
 import { NestFactory } from '@nestjs/core';

diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
@@ -28,7 +28,7 @@ RUN adduser --system --uid 1001 nextjs
 
 COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
 COPY --from=builder /app/node_modules ./node_modules
-COPY --from=builder /app/.next/package.json ./package.json
+COPY --from=builder /app/package.json ./package.json
 
 USER nextjs
 

diff --git a/apps/web/yarn.lock b/apps/web/yarn.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,12 +4,12 @@ services:
     build:
       context: apps/web
       dockerfile: Dockerfile
-      target: builder
-    command: yarn dev
+      target: runner
+    # command: yarn dev
     env_file: apps/web/.env.local
     image: web
-    volumes:
-      - ./apps/web:/app
+    # volumes:
+    #   - ./apps/web:/app
 
     ports:
       - "3000:3000"
@@ -20,12 +20,12 @@ services:
     build:
       context: apps/admin
       dockerfile: Dockerfile
-      target: builder
-    command: yarn dev
+      target: runner
+    # command: yarn dev
     env_file: apps/admin/.env.local
     image: admin
-    volumes:
-      - ./apps/admin:/app
+    # volumes:
+    #   - ./apps/admin:/app
     ports:
       - 4000:3000
     depends_on:
@@ -35,12 +35,12 @@ services:
     build:
       context: apps/api
       dockerfile: Dockerfile
-      target: builder
-    command: yarn dev
+      target: runner
+    # command: yarn dev
     env_file: apps/api/.env
     image: api
-    volumes:
-      - ./apps/api:/app
+    # volumes:
+    #   - ./apps/api:/app
     #   - /app/node_modules
     ports:
       - "3333:3333"