fixed image detection in client container

.gitea/workflows/build.yml

@@ -3,7 +3,7 @@ name: Rust Cross-Platform Build
 on:
   workflow_dispatch:
   push:
-    branches: [ "development", "main", "feature/*", "bugfix/*", "enhancement/*" ]
+    branches: [ "development", "main", "staging" ]
     tags: [ "v*.*.*" ]
 
 env:
@@ -152,10 +152,11 @@ jobs:
   set-tag:
     name: Set Tag Name
     needs: [detect-project, build]
-    if: ${{ !failure() && !cancelled() && github.event_name != 'pull_request' }}
+    #if: ${{ !failure() && !cancelled() && github.event_name != 'pull_request' }}
     runs-on: ubuntu-latest
     outputs:
       tag_name: ${{ steps.set_tag.outputs.tag_name }}
+      should_tag: ${{ steps.set_tag.outputs.should_tag }}
     steps:
       - uses: actions/checkout@v4
 
@@ -179,30 +180,35 @@ jobs:
             major=$((major + 1))
             minor=0
             patch=0
+            new_tag="v${major}.${minor}.${patch}"
+            echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
+            echo "should_tag=true" >> $GITHUB_OUTPUT
+            echo "Creating new major version tag: ${new_tag}"
+            
           elif [[ "${GITHUB_REF}" == "refs/heads/development" ]]; then
             minor=$((minor + 1))
             patch=0
-          elif [[ "${GITHUB_REF}" == "refs/heads/staging" ]]; then
-            patch=$((patch + 1))
-          else
-            echo "Not on main, development, or staging branch. Using latest tag: $latest_tag"
-            echo "Not building docker image for this branch."
-            new_tag="$latest_tag"
-            echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
             new_tag="v${major}.${minor}.${patch}"
             echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
+            echo "should_tag=true" >> $GITHUB_OUTPUT
+            echo "Creating new minor version tag: ${new_tag}"
+            
+          elif [[ "${GITHUB_REF}" == "refs/heads/staging" ]]; then
+            patch=$((patch + 1))
+            new_tag="v${major}.${minor}.${patch}"
+            echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
+            echo "should_tag=true" >> $GITHUB_OUTPUT
+            echo "Creating new patch version tag: ${new_tag}"
+          fi
 
   docker-build:
     name: Build and Push Docker Image
     needs: [detect-project, build, set-tag]
-    #if: |
+    if: | 
-    #  always() && 
+      needs.detect-project.result == 'success' && 
-    #  needs.detect-project.result == 'success' && 
+      needs.build.result == 'success' &&
-    #  needs.build.result == 'success' &&
+      needs.set-tag.outputs.should_tag == 'true' &&
-    #  github.event_name != 'pull_request'
+      github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     environment: production
     steps:
@@ -254,10 +260,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          echo "Creating new tag: ${{ needs.set-tag.outputs.tag_name }}"
           git tag ${{ needs.set-tag.outputs.tag_name }}
           git push origin ${{ needs.set-tag.outputs.tag_name }}
 
-
   summary:
     name: Workflow Summary
     needs: [test, build, docker-build]

WatcherAgent/src/docker/mod.rs

@@ -55,7 +55,7 @@ impl DockerManager {
 
         Ok(containers
             .into_iter()
-            .find(|c| c.image == client_image)
+            .find(|c| c.image.contains(client_image))
             .map(|container| DockerContainerDto {
                 id: container.id,
                 image: container.image,
@@ -68,11 +68,11 @@ impl DockerManager {
         match self.get_client_container().await {
             Ok(Some(container)) => container.image,
             Ok(None) => {
-                eprintln!("Warning: No WatcherAgent container found");
+                println!("Warning: No WatcherAgent container found");
                 "unknown".to_string()
             }
             Err(e) => {
-                eprintln!("Warning: Could not get current image version: {}", e);
+                println!("Warning: Could not get current image version: {}", e);
                 "unknown".to_string()
             }
         }