Docker compose import (#3191)

* fixed docker-compose.dev.yaml

* added new update

* Update package-lock.json

* Update docker-compose.dev.yaml according to code rabbit

* Update docker-compose.dev.yaml

* code is working

Author: VanshikaSabharwal

.husky/post-merge

@@ -1,5 +1,5 @@
 # Stage 1: Build stage
-FROM node:20.10.0 
+FROM node:23.7.0 
 
 WORKDIR /usr/src/app
 

.husky/pre-commit

@@ -1,23 +1,22 @@
 version: "3.8"
 services:
   mongo:
-  # No light weight image is available for mongo
-    image: mongo:latest
+    # No light weight image is available for mongo
+    image: mongo
     container_name: mongo
     restart: unless-stopped
     healthcheck:
-      test: mongosh --eval "try { rs.status().ok } catch (e) { 0 }"
-      interval: 30s
+      test: ["CMD", "mongosh", "--eval", "db.runCommand({ ping: 1 }).ok"]
+      interval: 10s
       timeout: 5s
-      retries: 30
+      retries: 10
     deploy:
       resources:
         limits:
           memory: 1G
-          cpus: '1.0'
+          cpus: "1.0"
     ports:
-      - "127.0.0.1:27017:27017"
-
+      - "27017:27017"
     volumes:
       - mongo_data:/data/db
       - ./scripts/docker/init-mongo.sh:/init-mongo.sh
@@ -33,27 +32,27 @@ services:
       resources:
         limits:
           memory: 512M
-          cpus: '0.5'
+          cpus: "0.5"
     volumes:
       - redis-data:/data/redis
     networks:
       - talawa-network
 
   minio:
-  # No light weight image is available
+    # No light weight image is available
     image: minio/minio
     ports:
       - "9000:9000"
       - "9001:9001"
-    environment:  
+    environment:
       - MINIO_ROOT_USER=${MINIO_ROOT_USER}
       - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}
     command: server /data --console-address ":9001"
     deploy:
       resources:
         limits:
           memory: 512M
-          cpus: '0.5'
+          cpus: "0.5"
     volumes:
       - minio-data:/data
     networks:
@@ -68,6 +67,7 @@ services:
       - "4000:4000"
     volumes:
       - /usr/src/app/node_modules
+      - ./scripts/docker/init-data-import.sh:/init-data-import.sh
     depends_on:
       mongo:
         condition: service_healthy
@@ -76,14 +76,16 @@ services:
       minio:
         condition: service_started
     environment:
-      - MONGO_DB_URL=mongodb://mongo:27017/talawa-api?replicaSet=rs0&directConnection=true
+      - MONGO_DB_URL=mongodb://mongo:27017/talawa-dev?replicaSet=rs0
+      - NODE_ENV=development
       - REDIS_HOST=redis-stack-server
       - REDIS_PORT=6379
     deploy:
       resources:
         limits:
           memory: 1G
-          cpus: '1.0'
+          cpus: "1.0"
+    entrypoint: ["/bin/bash", "/init-data-import.sh"]
     networks:
       - talawa-network
 
@@ -99,12 +101,19 @@ services:
       - $PWD/site:/srv
       - caddy_data:/data
       - caddy_config:/config
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:4000/graphql"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     deploy:
       resources:
         limits:
           memory: 256M
-          cpus: '0.25'
-    
+          cpus: "0.25"
+    networks:
+      - talawa-network
+
 volumes:
   redis-data:
   minio-data:
@@ -113,4 +122,4 @@ volumes:
   caddy_config:
 
 networks:
-  talawa-network:
+  talawa-network:

Dockerfile.dev

@@ -2,63 +2,81 @@
 import argparse
 import subprocess
 import os
-
+import shutil
 
 def execute_command(cmd):
-    """Execute a shell command.
+    """Execute a shell command, capturing and printing output.
 
     Args:
         cmd: A list of strings representing the command and its arguments.
 
     Raises:
+        FileNotFoundError: If npm executable is not found
         SystemExit: If the command returns a non-zero exit code.
     """
-    process = subprocess.run(cmd, capture_output=True, text=True)
 
-    if process.returncode != 0:
-        print(f"Error occurred: {process.stderr}")
-        raise SystemExit(1)
-    else:
-        print(process.stdout)
+    npm_path = shutil.which("npm")  # Find the npm executable
+    if npm_path is None:
+        raise FileNotFoundError("npm executable not found.")
 
+    if cmd[0] == "npm":
+        cmd[0] = npm_path
 
-def main():
-    """Main function to parse command-line arguments and execute commands.
+    print(f"Executing command: {cmd}")
+    print(f"Current working directory: {os.getcwd()}")
 
-    Args:
-        None
+    process = subprocess.run(cmd, capture_output=True, text=True, env=os.environ, check=True) # check=True raises exception for non-zero return code
 
-    Raises:
-        SystemExit: If any of the executed commands returns a non-zero exit code.
-    """
+    print(process.stdout)  # Print stdout regardless of success/failure
+    if process.returncode != 0:
+        print(f"Error occurred: {process.stderr}")
+        raise SystemExit(process.returncode) # Raise SystemExit with the return code
+
+def main():
+    """Main function to parse command-line arguments and execute commands."""
     parser = argparse.ArgumentParser(description="Database reset script.")
-    parser.add_argument(
-        "--mongo-container", help="MongoDB container name", required=True
-    )
+    parser.add_argument("--mongo-container", help="MongoDB container name", required=True)
     parser.add_argument("--mongo-db", help="MongoDB database name", required=True)
     parser.add_argument("--repo-dir", help="Repository directory", required=True)
 
     args = parser.parse_args()
 
-    # Use docker exec command to drop the specified MongoDB database
-    execute_command(
-        [
-            "docker",
-            "exec",
-            "-it",
-            args.mongo_container,
-            "mongosh",
-            "--eval",
-            f"db.getSiblingDB('{args.mongo_db}').dropDatabase()",
-        ]
-    )
+    try: # added try-except block
+        print(f"Dropping database: {args.mongo_db} in container: {args.mongo_container}")
+        execute_command(
+            [
+                "docker",
+                "exec",
+                "-it",  # Consider removing -it if not needed for interaction
+                args.mongo_container,
+                "mongosh",
+                "--eval",
+                f"db.getSiblingDB('{args.mongo_db}').dropDatabase()",
+            ]
+        )
+        print(f"Changing directory to: {args.repo_dir}")
+        os.chdir(args.repo_dir)
+
+        print("Stopping existing containers...")
+        execute_command(["docker","compose", "-f", "docker-compose.dev.yaml", "down"])
+
+        print("Starting containers using docker-compose...")
+        execute_command(["docker","compose", "-f", "docker-compose.dev.yaml", "up","--build","-d"])
 
-    # Changing to repo dir
-    os.chdir(args.repo_dir)
+        print("Database reset and services restarted successfully.")
 
-    # Run a command to import sample data using npm
-    execute_command(["npm", "run", "import:sample-data"])
 
+    except FileNotFoundError as e:
+        print(f"Error: {e}")
+        SystemExit(1)
+    except subprocess.CalledProcessError as e: # catch subprocess errors
+        print(f"Command execution failed with return code {e.returncode}")
+        print(f"Stdout: {e.stdout}")
+        print(f"Stderr: {e.stderr}")
+        SystemExit(e.returncode)
+    except SystemExit as e:
+        print(f"A critical error occurred. Exiting with code {e}")
+        exit(e)  # Exit with the captured code
 
 if __name__ == "__main__":
-    main()
+    main()

docker-compose.dev.yaml

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# Import sample data
+echo "Importing sample data..."
+npm run import:sample-data || {
+    echo "Sample data import failed."
+    exit 1
+}
+echo "Sample data import successful."
+
+# Start the API server
+npm run dev