From b938d85072b42acc39abb41a73ec7379444e3da3 Mon Sep 17 00:00:00 2001
From: yznahmad <jaradatgamer@gmail.com>
Date: Thu, 3 Jul 2025 02:45:42 +0300
Subject: [PATCH] Add v120g 212      rssu3

---
 docker-compose.yml | 18 +++++++++++++++---
 webapp/Dockerfile  |  5 ++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 48276cd..d158de0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,6 +25,10 @@ services:
     build:
       context: .
       dockerfile: webapp/Dockerfile
+      args:
+        MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME}
+        MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD}
+        DB_URI: mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/Infinity?authSource=admin
     container_name: infinity-webapp
     restart: always
     depends_on:
@@ -32,7 +36,7 @@ services:
         condition: service_healthy
     environment:
       - NODE_ENV=${NODE_ENV}
-      - DB_URI=${DB_URI}
+      - DB_URI=mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/Infinity?authSource=admin
       - NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
     env_file: .env
     ports:
@@ -45,13 +49,17 @@ services:
     build:
       context: .
       dockerfile: worker/Dockerfile
+      args:
+        MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME}
+        MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD}
+        DB_URI: mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/Infinity?authSource=admin
     container_name: infinity-worker
     restart: always
     depends_on:
       mongodb:
         condition: service_healthy
     environment:
-      - DB_URI=${DB_URI}
+      - DB_URI=mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/Infinity?authSource=admin
     env_file: .env
     networks:
       - infinity-network
@@ -61,12 +69,16 @@ services:
     build:
       context: .
       dockerfile: helpers/Dockerfile
+      args:
+        MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME}
+        MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD}
+        DB_URI: mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/Infinity?authSource=admin
     container_name: infinity-create-admin
     depends_on:
       mongodb:
         condition: service_healthy
     environment:
-      - DB_URI=${DB_URI}
+      - DB_URI=mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/Infinity?authSource=admin
       - ADMIN_USERNAME=${ADMIN_USERNAME}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
     env_file: .env
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index df732e7..aadb66b 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -11,11 +11,10 @@ RUN npm ci
 COPY webapp/ .
 
 # Set environment variables for build
+ARG DB_URI
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
-# Use a dummy DB_URI during build to prevent connection attempts
-# ENV DB_URI=mongodb://dummy:password@localhost:27017/dummy
-ENV DB_URI=mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongodb:27017/Infinity?authSource=admin
+ENV DB_URI=${DB_URI}
 
 # Build the application
 RUN npm run build