CI/CD improvements + parallel builds + stable deployment

.github/workflows/ci.yml

@@ -10,109 +10,146 @@ on:
       - main
 
 jobs:
-  build:
+  build-jars:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        service:
+          - auth-service
+          - task-service
+          - api-gateway
+          - service-registry
 
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+
+      - name: Build ${{ matrix.service }}
+        run: mvn -f ${{ matrix.service }}/pom.xml clean package -DskipTests
+
+      - name: Upload JAR
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.service }}-jar
+          path: ${{ matrix.service }}/target/*.jar
+          if-no-files-found: error
+
+  integration:
+    runs-on: ubuntu-latest
+    needs: build-jars
 
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 17
-
-    - name: Cache Maven dependencies
-      uses: actions/cache@v4
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-
-    - name: Build auth-service
-      run: cd auth-service && mvn clean install
-
-    - name: Build task-service
-      run: cd task-service && mvn clean install
-
-    - name: Build api-gateway
-      run: cd api-gateway && mvn clean install
-
-    - name: Build service-registry
-      run: cd service-registry && mvn clean install
-
-    - name: Build Docker images
-      run: |
-        docker build -t task-manager-auth ./auth-service
-        docker build -t task-manager-task ./task-service
-        docker build -t task-manager-gateway ./api-gateway
-        docker build -t task-manager-registry ./service-registry
-
-    - name: Build services (compose)
-      run: docker compose build
-
-    - name: Start services
-      run: docker compose up -d
-
-    - name: Wait for system readiness
-      run: |
-        for i in {1..40}; do
-          echo "Checking system readiness..."
-
-          auth_status=$(curl -s -o /dev/null -w "%{http_code}" \
-            -X POST http://localhost:8090/api/auth/login \
-            -H "Content-Type: application/json" \
-            -d '{"username":"test","password":"test"}' \
-            || echo "000")
-
-          task_status=$(curl -s -o /dev/null -w "%{http_code}" \
-            http://localhost:8090/api/tasks/dashboard || echo "000")
-
-          echo "Auth: $auth_status | Task: $task_status"
-
-          if [[ "$auth_status" =~ ^(200|400|401)$ ]] && [[ "$task_status" =~ ^(200|403)$ ]]; then
-            echo "System is READY ✅"
-            exit 0
-          fi
-
-          sleep 5
-        done
-
-        echo "System NOT ready ❌"
-        docker compose logs
-        exit 1
-
-    - name: Setup Node
-      uses: actions/setup-node@v4
-      with:
-        node-version: 18
-
-    - name: Install Newman
-      run: npm install -g newman
-
-    - name: Run Postman tests
-      run: newman run postman_collection.json -e postman_environment.json
-
-    - name: Stop services
-      run: docker compose down -v
-
-    - name: Login to DockerHub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Push Docker images
-      run: |
-        docker tag task-manager-auth ${{ secrets.DOCKER_USERNAME }}/task-manager-auth
-        docker push ${{ secrets.DOCKER_USERNAME }}/task-manager-auth
-
-        docker tag task-manager-task ${{ secrets.DOCKER_USERNAME }}/task-manager-task
-        docker push ${{ secrets.DOCKER_USERNAME }}/task-manager-task
-
-        docker tag task-manager-gateway ${{ secrets.DOCKER_USERNAME }}/task-manager-gateway
-        docker push ${{ secrets.DOCKER_USERNAME }}/task-manager-gateway
-
-        docker tag task-manager-registry ${{ secrets.DOCKER_USERNAME }}/task-manager-registry
-        docker push ${{ secrets.DOCKER_USERNAME }}/task-manager-registry
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+
+      - name: Download auth-service jar
+        uses: actions/download-artifact@v4
+        with:
+          name: auth-service-jar
+          path: auth-service/target
+
+      - name: Download task-service jar
+        uses: actions/download-artifact@v4
+        with:
+          name: task-service-jar
+          path: task-service/target
+
+      - name: Download api-gateway jar
+        uses: actions/download-artifact@v4
+        with:
+          name: api-gateway-jar
+          path: api-gateway/target
+
+      - name: Download service-registry jar
+        uses: actions/download-artifact@v4
+        with:
+          name: service-registry-jar
+          path: service-registry/target
+
+      - name: Build Docker images
+        run: docker compose build
+
+      - name: Start services
+        run: docker compose up -d
+
+      - name: Wait before readiness checks
+        run: sleep 40
+
+      - name: Wait for Gateway
+        run: |
+          for i in $(seq 1 50); do
+            status=$(curl -s -o /dev/null -w "%{http_code}" \
+              -X POST http://localhost:8090/api/auth/login \
+              -H "Content-Type: application/json" \
+              -d '{"username":"test","password":"test"}' \
+              || echo "000")
+
+            echo "Gateway status: $status"
+
+            if [ "$status" = "200" ] || [ "$status" = "400" ] || [ "$status" = "401" ]; then
+              echo "Gateway ready"
+              exit 0
+            fi
+
+            sleep 5
+          done
+
+          echo "Gateway NOT ready"
+          docker compose logs --no-color
+          exit 1
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - name: Install Newman
+        run: npm install -g newman
+
+      - name: Run Postman tests
+        run: |
+          newman run postman_collection.json \
+            -e postman_environment.json \
+            --env-var "baseUrl=http://localhost:8090"
+
+      - name: Stop services
+        run: docker compose down -v
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Push images
+        if: github.ref == 'refs/heads/main'
+        run: |
+          docker push yash9912/task-manager-auth:latest
+          docker push yash9912/task-manager-task:latest
+          docker push yash9912/task-manager-gateway:latest
+          docker push yash9912/task-manager-registry:latest 

api-gateway/src/main/resources/application-docker.properties

@@ -2,8 +2,10 @@ server.port=8080
 spring.application.name=api-gateway
 eureka.client.serviceUrl.defaultZone=http://service-registry:8761/eureka
 spring.cloud.gateway.routes[0].id=auth
-spring.cloud.gateway.routes[0].uri=lb://auth-service
+spring.cloud.gateway.routes[0].uri=lb://AUTH-SERVICE
 spring.cloud.gateway.routes[0].predicates[0]=Path=/api/auth/**
 spring.cloud.gateway.routes[1].id=task
-spring.cloud.gateway.routes[1].uri=lb://task-service
+spring.cloud.gateway.routes[1].uri=lb://TASK-SERVICE
 spring.cloud.gateway.routes[1].predicates[0]=Path=/api/tasks/**
+spring.cloud.gateway.discovery.locator.enabled=true
+spring.cloud.loadbalancer.retry.enabled=true

docker-compose.yml

@@ -1,32 +1,26 @@
-version: "3.9"
-
 services:
 
   service-registry:
     build: ./service-registry
-    container_name: service-registry
+    image: yash9912/task-manager-registry
     ports:
       - "8761:8761"
     networks:
       - microservices-net
     environment:
       - SPRING_PROFILES_ACTIVE=docker
+
   redis:
     image: redis:7
-    container_name: redis
     ports:
       - "6379:6379"
     command: ["redis-server", "--bind", "0.0.0.0", "--protected-mode", "no"]
     networks:
       - microservices-net
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 5s
-      timeout: 3s
-      retries: 5
+
   auth-service:
     build: ./auth-service
-    container_name: auth-service
+    image: yash9912/task-manager-auth
     ports:
       - "8085:8081"
     depends_on:
@@ -39,29 +33,29 @@ services:
 
   task-service:
     build: ./task-service
-    container_name: task-service
+    image: yash9912/task-manager-task
     ports:
       - "8082:8082"
     depends_on:
-       service-registry :
-         condition: service_started
-       redis :
-         condition: service_healthy
-    restart: always
+      - service-registry
+      - redis
     environment:
       - SPRING_PROFILES_ACTIVE=docker
     networks:
       - microservices-net
 
   api-gateway:
     build: ./api-gateway
-    container_name: api-gateway
+    image: yash9912/task-manager-gateway
     ports:
       - "8090:8080"
     depends_on:
-      - service-registry
-      - auth-service
-      - task-service
+       service-registry :
+          condition: service_started
+       auth-service :
+          condition: service_started
+       task-service :
+          condition: service_started
     environment:
       - SPRING_PROFILES_ACTIVE=docker
     networks:
@@ -70,4 +64,3 @@ services:
 networks:
   microservices-net:
     driver: bridge
-

postman/collections/Task Manager E2E/create-task.request.yaml

@@ -0,0 +1,18 @@
+$kind: http-request
+name: create-task
+url: "{{baseUrl}}/api/tasks"
+method: POST
+body:
+  type: json
+  content: "{\r
+
+    \  \"title\": \"Task {{username}}\",\r
+
+    \  \"description\": \"Generated dynamically\"\r
+
+    }"
+auth:
+  type: bearer
+  credentials:
+    token: auth_token
+order: 4503596869659604

postman/collections/Task Manager E2E/dashboard.request.yaml

@@ -0,0 +1,5 @@
+$kind: http-request
+name: dashboard
+url: ""
+method: GET
+order: 4503596896278070