Add v120g 212 rssu3

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

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