refactor: streamline GitHub Actions workflow by simplifying Maven and Docker steps

Author: AbaSheger

.github/workflows/deploy.yml

@@ -26,15 +26,13 @@ jobs:
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
 
-    # Verify Maven configuration
-    - name: Debug Maven Configuration
+    - name: Verify Maven Configuration
       run: |
-        echo "Verifying Maven configuration..."
+        echo "Checking Maven setup..."
         echo "JAVA_HOME: $JAVA_HOME"
         mvn -version
         ls -la ~/.m2 || true
         
-    # Create local Maven settings with credentials
     - name: Setup Maven Settings
       run: |
         mkdir -p ~/.m2
@@ -49,55 +47,17 @@ jobs:
               <password>${{ secrets.MAVEN_PASSWORD }}</password>
             </server>
           </servers>
-          <mirrors>
-            <mirror>
-              <id>central</id>
-              <name>Maven Central</name>
-              <url>https://repo1.maven.org/maven2/</url>
-              <mirrorOf>central</mirrorOf>
-            </mirror>
-          </mirrors>
-          <profiles>
-            <profile>
-              <id>default</id>
-              <repositories>
-                <repository>
-                  <id>central</id>
-                  <url>https://repo1.maven.org/maven2</url>
-                  <releases>
-                    <enabled>true</enabled>
-                  </releases>
-                  <snapshots>
-                    <enabled>false</enabled>
-                  </snapshots>
-                </repository>
-              </repositories>
-            </profile>
-          </profiles>
-          <activeProfiles>
-            <activeProfile>default</activeProfile>
-          </activeProfiles>
         </settings>' > ~/.m2/settings.xml
 
-    # Build with Maven using explicit credentials
     - name: Build with Maven
       env:
         MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
         MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
       run: |
-        echo "Starting Maven build..."
-        mvn -B -X -s ~/.m2/settings.xml clean install -DskipTests || {
-          echo "Maven build failed. Checking settings..."
-          ls -la ~/.m2
-          echo "Current directory contents:"
-          ls -la
-          exit 1
-        }
+        mvn -B -s ~/.m2/settings.xml clean install -DskipTests
 
-    # Verify build artifacts
     - name: Verify Build Artifacts
       run: |
-        echo "Checking build artifacts..."
         for service in api-gateway eureka-server recommendation-service statistics-service user-tracking-service; do
           if [ -f "$service/target/$service-1.0-SNAPSHOT.jar" ]; then
             echo "$service build successful"
@@ -107,72 +67,31 @@ jobs:
           fi
         done
 
-    # Set up Docker buildx
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
 
-    # Verify Docker setup
-    - name: Verify Docker Configuration
-      run: |
-        echo "Docker version:"
-        docker version
-        echo "Docker info:"
-        docker info
-
-    # Login to Oracle Container Registry
     - name: Log in to Oracle Container Registry
       uses: docker/login-action@v1
       with:
         registry: ${{ secrets.OCI_REGISTRY }}
         username: ${{ secrets.OCI_USERNAME }}
         password: ${{ secrets.OCI_AUTH_TOKEN }}
 
-    # Build and push Docker images with better error handling
-    - name: Build and push Docker images
+    - name: Build and Push Docker Images
       env:
         REGISTRY: ${{ secrets.OCI_REGISTRY }}
         NAMESPACE: ${{ secrets.OCI_NAMESPACE }}
       run: |
-        echo "Building and pushing Docker images..."
-        
-        # Function to build and push an image
-        build_and_push() {
-          local service=$1
-          echo "Processing $service..."
-          
-          # Build image
-          echo "Building $service image..."
-          docker build -t ${REGISTRY}/${NAMESPACE}/$service:latest -f $service/Dockerfile . || {
-            echo "Error building $service image"
-            return 1
-          }
-          
-          # Push image
-          echo "Pushing $service image..."
-          docker push ${REGISTRY}/${NAMESPACE}/$service:latest || {
-            echo "Error pushing $service image"
-            return 1
-          }
-          
-          echo "$service successfully built and pushed"
-          return 0
-        }
-        
-        # Process each service
         services=("api-gateway" "eureka-server" "recommendation-service" "statistics-service" "user-tracking-service")
         for service in "${services[@]}"; do
-          build_and_push $service || {
-            echo "Failed to process $service"
-            exit 1
-          }
+          echo "Building and pushing $service..."
+          docker build -t ${REGISTRY}/${NAMESPACE}/$service:latest -f $service/Dockerfile .
+          docker push ${REGISTRY}/${NAMESPACE}/$service:latest
         done
 
-    # Logout from Docker registry
     - name: Log out from Oracle Container Registry
-      if: always()
-      run: |
-        echo "Logging out from Docker registry..."
-        docker logout ${{ secrets.OCI_REGISTRY }}
+      if: ${{ always() }}
+      run: docker logout ${{ secrets.OCI_REGISTRY }}
 
   deploy:
     runs-on: ubuntu-latest
@@ -187,23 +106,20 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v2
 
-    # Login to Oracle Container Registry for deployment
     - name: Log in to Oracle Container Registry
       uses: docker/login-action@v1
       with:
         registry: ${{ secrets.OCI_REGISTRY }}
         username: ${{ secrets.OCI_USERNAME }}
         password: ${{ secrets.OCI_AUTH_TOKEN }}
 
-    # Verify VM connection before deployment
     - name: Verify VM Connection
       env:
         ORACLE_VM_IP: ${{ secrets.ORACLE_VM_IP }}
       run: |
-        echo "Verifying VM connection..."
         echo "${{ secrets.SSH_PRIVATE_KEY }}" > ssh_key.pem
         chmod 600 ssh_key.pem
-        ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 -i ssh_key.pem opc@${ORACLE_VM_IP} echo "VM connection successful" || {
+        ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} echo "VM connection successful" || {
           echo "Failed to connect to VM"
           exit 1
         }
@@ -212,46 +128,19 @@ jobs:
       env:
         ORACLE_VM_IP: ${{ secrets.ORACLE_VM_IP }}
       run: |
-        echo "Starting deployment..."
         echo "${{ secrets.SSH_PRIVATE_KEY }}" > ssh_key.pem
         chmod 600 ssh_key.pem
         ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} << 'EOF'
           echo "Deploying to VM..."
-          cd ~/music-analytics/vm-deploy || {
-            echo "Failed to change directory"
-            exit 1
-          }
-          
-          echo "Logging into Docker registry..."
-          docker login ${REGISTRY} -u ${OCI_USERNAME} -p ${OCI_AUTH_TOKEN} || {
-            echo "Docker login failed"
-            exit 1
-          }
-          
-          echo "Pulling latest images..."
-          docker-compose pull || {
-            echo "Failed to pull images"
-            docker logout ${REGISTRY}
-            exit 1
-          }
-          
-          echo "Starting services..."
-          docker-compose up -d || {
-            echo "Failed to start services"
-            docker logout ${REGISTRY}
-            exit 1
-          }
-          
-          echo "Logging out from Docker registry..."
+          cd ~/music-analytics/vm-deploy || exit 1
+          docker login ${REGISTRY} -u ${OCI_USERNAME} -p ${OCI_AUTH_TOKEN} || exit 1
+          docker-compose pull || { docker logout ${REGISTRY}; exit 1; }
+          docker-compose up -d || { docker logout ${REGISTRY}; exit 1; }
           docker logout ${REGISTRY}
-          
           echo "Deployment completed successfully"
-EOF
-        rm -f ssh_key.pem  # Clean up sensitive files
+        EOF
+        rm -f ssh_key.pem
 
-    # Logout from Docker registry
     - name: Log out from Oracle Container Registry
-      if: always()
-      run: |
-        echo "Final cleanup: Logging out from Docker registry..."
-        docker logout ${{ secrets.OCI_REGISTRY }}
+      if: ${{ always() }}
+      run: docker logout ${{ secrets.OCI_REGISTRY }}