update microservice pattern

Author: hmake98

auth

@@ -1,19 +1,23 @@
 #!/bin/bash
 
+# Function to build a Docker image for a given folder
 build_docker_image() {
     local folder="$1"
     local service_name=$(basename "$folder")
     if [[ -e "$folder/Dockerfile" ]]; then
         echo ">>> Building service ${service_name}..."
-        docker build -t "${service_name}:latest" -f "$folder/Dockerfile" "$folder" && echo ">>> Build completed for ${service_name}"
-        echo ">>> Built ${service_name}..."
+        if docker build -t "${service_name}:latest" -f "$folder/Dockerfile" "$folder"; then
+            echo ">>> Build completed for ${service_name}"
+        else
+            echo ">>> Build failed for ${service_name}" >&2
+        fi
     fi
 }
 
-find . -maxdepth 1 -type d | while read -r dir; do
-    if [[ "$dir" != "." ]]; then
-        build_docker_image "$dir"
-    fi
-done
+# Export the function to be used by parallel
+export -f build_docker_image
+
+# Find all directories with a Dockerfile and build images in parallel
+find . -maxdepth 1 -type d -not -path '.' -print0 | xargs -0 -n 1 -P $(nproc) bash -c 'build_docker_image "$0"'
 
 echo ">>> All builds completed"

build.sh

@@ -1,5 +1,38 @@
 #!/bin/bash
 
+# Function to log into AWS ECR
+aws_ecr_login() {
+    echo ">>> Logging into AWS ECR"
+    aws ecr get-login-password --region "$AWS_REGION" | docker login --username AWS --password-stdin "$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com"
+}
+
+# Function to build and push Docker image
+build_and_push_image() {
+    local service_name="$1"
+    local image_name="nestjs_$service_name:latest"
+    local ecr_image_uri="$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$service_name:latest"
+
+    echo ">>> Building $image_name"
+    docker build -t "$image_name" -f "$service_name/Dockerfile" "$service_name"
+
+    if [ $? -eq 0 ]; then
+        echo ">>> Tagging $image_name"
+        docker tag "$image_name" "$ecr_image_uri"
+
+        echo ">>> Pushing $image_name"
+        docker push "$ecr_image_uri"
+
+        if [ $? -eq 0 ]; then
+            echo ">>> Deployment completed for $service_name"
+        else
+            echo ">>> Failed to push image $image_name" >&2
+        fi
+    else
+        echo ">>> Failed to build image $image_name" >&2
+    fi
+}
+
+# Main script execution
 printf "Please select service:\n"
 select d in */; do
     test -n "$d" && break
@@ -9,35 +42,14 @@ done
 service_name="${d%/}"
 
 if [ "$service_name" == 'fluent-bit' ]; then
+    echo ">>> Service fluent-bit is not allowed for deployment"
     exit 1
 fi
 
-service_dir="./$service_name"
-
-if [ ! -e "$service_dir/Dockerfile" ]; then
+if [ ! -e "$service_name/Dockerfile" ]; then
     echo ">>> Dockerfile not found for service $service_name"
     exit 1
 fi
 
 echo ">>> Deploying service $service_name..."
-cd "$service_dir" || exit
-
-aws_ecr_login() {
-    echo ">>> Logging into AWS ECR"
-    aws ecr get-login-password --region "$AWS_REGION" | docker login --username AWS --password-stdin "$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/nestjs-microservices-$service_name"
-}
-
-build_and_push_image() {
-    local image_name="nestjs_$service_name:latest"
-    echo ">>> Building $image_name"
-    docker build -t "$image_name" -f Dockerfile .
-    echo ">>> Tagging $image_name"
-    docker tag "$image_name" "$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$service_name:latest"
-    echo ">>> Pushing $image_name"
-    docker push "$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$service_name:latest"
-}
-
-aws_ecr_login && build_and_push_image
-
-echo ">>> Deployment completed for $service_name"
-cd ..
+aws_ecr_login && build_and_push_image "$service_name"

deploy.sh

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   postgres:
     image: postgres:latest

docker-compose.dep.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   fluent-bit:
     environment:
@@ -26,6 +24,8 @@ services:
     ports:
       - "3000:3000"
     environment:
+      GF_SECURITY_ADMIN_USER: admin
+      GF_SECURITY_ADMIN_PASSWORD: master123
       GF_RENDERING_SERVER_URL: http://renderer:8081/render
       GF_RENDERING_CALLBACK_URL: http://grafana:3000/
       GF_LOG_FILTERS: rendering:debug

docker-compose.grafana.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   auth-service:
     build:
@@ -15,12 +13,12 @@ services:
     volumes:
       - ./auth:/app/auth
       - /app/auth/node_modules
-    # logging:
-    #   driver: fluentd
-    #   options:
-    #     fluentd-async: "true"
-    #     fluentd-address: localhost:24224
-    #     tag: auth-service
+    logging:
+      driver: fluentd
+      options:
+        fluentd-async: "true"
+        fluentd-address: localhost:24224
+        tag: auth-service
 
   post-service:
     build:
@@ -36,12 +34,12 @@ services:
     volumes:
       - ./post:/app/post
       - /app/post/node_modules
-    # logging:
-    #   driver: fluentd
-    #   options:
-    #     fluentd-async: "true"
-    #     fluentd-address: localhost:24224
-    #     tag: post-service
+    logging:
+      driver: fluentd
+      options:
+        fluentd-async: "true"
+        fluentd-address: localhost:24224
+        tag: post-service
 
   files-service:
     build:
@@ -57,12 +55,12 @@ services:
     volumes:
       - ./files:/app/files
       - /app/files/node_modules
-    # logging:
-    #   driver: fluentd
-    #   options:
-    #     fluentd-async: "true"
-    #     fluentd-address: localhost:24224
-    #     tag: files-service
+    logging:
+      driver: fluentd
+      options:
+        fluentd-async: "true"
+        fluentd-address: localhost:24224
+        tag: files-service
 
   notification-service:
     build:
@@ -78,12 +76,12 @@ services:
     volumes:
       - ./notification:/app/notification
       - /app/notification/node_modules
-    # logging:
-    #   driver: fluentd
-    #   options:
-    #     fluentd-async: "true"
-    #     fluentd-address: localhost:24224
-    #     tag: notification-service
+    logging:
+      driver: fluentd
+      options:
+        fluentd-async: "true"
+        fluentd-address: localhost:24224
+        tag: notification-service
 
   kong:
     build:

docker-compose.yml

@@ -31,13 +31,14 @@ services:
         strip_path: true
   - name: notification_service
     host: notification
-    port: 9003
+    port: 9004
     protocol: http
     routes:
       - name: notification_route
         paths:
           - /notification
         strip_path: true
+
 plugins:
   - name: rate-limiting
     config:

files

@@ -6,8 +6,10 @@
     "deploy": "sh deploy.sh",
     "build": "sh build.sh",
     "dep:up": "docker compose -f docker-compose.dep.yml up",
+    "dep:build": "docker compose -f docker-compose.dep.yml build",
     "dep:down": "docker compose -f docker-compose.dep.yml down",
     "grafana:up": "docker compose -f docker-compose.grafana.yml up",
+    "grafana:build": "docker compose -f docker-compose.grafana.yml build",
     "grafana:down": "docker compose -f docker-compose.grafana.yml down"
   },
   "keywords": [