fix(fga-eps-mds/2024.2-ARANDU-DOC#42): modifies docker configuration …

…and its files

.dockerignore

@@ -4,9 +4,9 @@
 .dockerignore
 
 # Build dependencies
-dist.do
-node_modules
-node_module 
+# dist.do
+# node_modules
+# node_module 
 
 # Misc
 .eslintrc.js

.env.dev.template

@@ -0,0 +1,14 @@
+MONGODB_URI=
+EMAIL_USER=
+EMAIL_PASS=
+SENDGRID_API_KEY=
+JWT_SECRET=
+JWT_EXPIRATION=
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+GOOGLE_CALLBACK_URL=
+MICROSOFT_CLIENT_ID=
+MICROSOFT_CLIENT_SECRET=
+MICROSOFT_TENANT_ID=
+MICROSOFT_CALLBACK_URL=
+FRONTEND_URL=

.env.prod.template

@@ -0,0 +1,14 @@
+MONGODB_URI=
+EMAIL_USER=
+EMAIL_PASS=
+SENDGRID_API_KEY=
+JWT_SECRET=
+JWT_EXPIRATION=
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+GOOGLE_CALLBACK_URL=
+MICROSOFT_CLIENT_ID=
+MICROSOFT_CLIENT_SECRET=
+MICROSOFT_TENANT_ID=
+MICROSOFT_CALLBACK_URL=
+FRONTEND_URL=

Dockerfile

@@ -1,14 +1,38 @@
-FROM node:22-alpine
-
-WORKDIR /app
+FROM node:22-alpine AS base
 
+FROM base AS deps
+RUN apk add --no-cache libc6-compat
 
-COPY package*.json ./
+WORKDIR /app
 
-RUN npm install
+COPY package.json package-lock.json* ./
+RUN \
+  if [ -f package-lock.json ]; then npm ci; \
+  fi
 
+FROM base AS builder
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
+COPY .env .env
 RUN npm run build
 
-CMD ["npm", "run", "start:dev"]
+FROM base AS runner
+WORKDIR /app
+
+ENV NODE_ENV production
+
+RUN addgroup -g 1001 -S nodejs \
+  && adduser -S arandu -u 1001
+
+COPY --chown=arandu:nodejs --from=builder /app/dist ./dist
+COPY --chown=arandu:nodejs --from=builder /app/node_modules ./node_modules
+
+USER arandu
+
+EXPOSE 3000
+
+ENV PORT=3000
+
+CMD ["node", "dist/main.js"]

Dockerfile.prod

@@ -0,0 +1,38 @@
+FROM node:22-alpine AS base
+
+FROM base AS deps
+RUN apk add --no-cache libc6-compat
+
+WORKDIR /app
+
+COPY package.json package-lock.json* ./
+RUN \
+  if [ -f package-lock.json ]; then npm ci; \
+  fi
+
+FROM base AS builder
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+
+COPY .env.prod.template .env
+RUN npm run build
+
+FROM base AS runner
+WORKDIR /app
+
+ENV NODE_ENV production
+
+RUN addgroup -g 1001 -S nodejs \
+  && adduser -S arandu -u 1001
+
+COPY --chown=arandu:nodejs --from=builder /app/dist ./dist
+COPY --chown=arandu:nodejs --from=builder /app/node_modules ./node_modules
+
+USER arandu
+
+EXPOSE 3000
+
+ENV PORT=3000
+
+CMD ["node", "dist/main.js"]

Makefile

@@ -0,0 +1,15 @@
+.PHONY: build
+build:
+	docker compose build
+
+.PHONY: start
+start:
+	docker compose up
+
+.PHONY: run
+run:
+	docker compose up --build
+
+.PHONY: stop
+stop:
+	docker compose down

docker-compose.yml

@@ -2,19 +2,17 @@ services:
   user-api:
     container_name: user-api
     restart: on-failure
-    build: .
-    environment:
-      - NODE_ENV=development
-    ports:
-      - 3000:3000
-    volumes:
-      - ./src:/app/src
-      - ./test:/app/test
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: user-api
     env_file:
       - .env
+    ports:
+      - "3000:3000"
     networks:
-      - calculus-network
+      - arandu-network
 
 networks:
-  calculus-network:
+  arandu-network:
     driver: bridge

src/app.module.ts

@@ -3,8 +3,8 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { MongooseModule } from '@nestjs/mongoose';
 import { UsersModule } from './users/users.module';
 
-import { AuthModule } from './auth/auth.module';
 import * as Joi from 'joi';
+import { AuthModule } from './auth/auth.module';
 
 @Module({
   imports: [