From 1b92513d7ac71f05bc888cfa9a830a2889ff50c5 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 04:06:05 +0300
Subject: [PATCH 01/16] Test new branch develop

---
 .woodpecker.yaml | 26 ++++++++++++++++----------
 backend/main.py  |  1 +
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index e0d7d2d..84e1c55 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -14,6 +14,7 @@ steps:
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
+        - develop-${CI_BUILD_NUMBER}
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -34,6 +35,7 @@ steps:
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
+        - develop-${CI_BUILD_NUMBER}
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -55,12 +57,14 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
-      - yq -i '.frontend.tag = "${CI_COMMIT_SHA:0:7}"' manifests/labmap/values.yaml
-      - git add manifests/labmap/values.yaml
-      - "git commit -m 'frontend: update tag to ${CI_COMMIT_SHA:0:7}' || echo 'No changes'"
-      - git push origin master
+      - |
+        TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
+        yq -i ".frontend.tag = \"${TAG}\"" manifests/labmap/values.yaml
+        git add manifests/labmap/values.yaml
+        git commit -m "frontend: update tag to ${TAG}" || echo "No changes"
+        git push origin master
 
   update-values-backend:
     name: Update backend tag in values.yaml
@@ -78,9 +82,11 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      # - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
-      - yq -i '.backend.tag = "${CI_COMMIT_SHA:0:7}"' manifests/labmap/values.yaml
-      - git add manifests/labmap/values.yaml
-      - "git commit -m 'backend: update tag to ${CI_COMMIT_SHA:0:7}' || echo 'No changes'"
-      - git push origin master
+      - |
+        TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
+        yq -i ".backend.tag = \"${TAG}\"" manifests/labmap/values.yaml
+        git add manifests/labmap/values.yaml
+        git commit -m "backend: update tag to ${TAG}" || echo "No changes"
+        git push origin master
diff --git a/backend/main.py b/backend/main.py
index 21d4717..0f6b923 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,5 +81,6 @@ def list_icons():
     return categories
 
 
+
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 7348a40c5c52a9baf614478e5b4cef5810e0bc3a Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 04:12:26 +0300
Subject: [PATCH 02/16] Fix pipeline

---
 .woodpecker.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 84e1c55..8d07ff9 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -57,7 +57,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
@@ -82,7 +82,6 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")

From 481010b76bafd3ae20e91391fbf5daad50ef55da Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 04:13:03 +0300
Subject: [PATCH 03/16] Fix pipeline and build the backend

---
 backend/main.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/main.py b/backend/main.py
index 0f6b923..21d4717 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,6 +81,5 @@ def list_icons():
     return categories
 
 
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 409f2c021625b9a6a9083c7a5b72b1b652f3a90c Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 04:14:49 +0300
Subject: [PATCH 04/16] Fix pipeline and build the backend

---
 .woodpecker.yaml | 1 +
 backend/main.py  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 8d07ff9..f11c2fa 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -82,6 +82,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
+      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
diff --git a/backend/main.py b/backend/main.py
index 21d4717..0f6b923 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,5 +81,6 @@ def list_icons():
     return categories
 
 
+
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From d66bb4e688ecd7bdcd37197510b003dfec95d776 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 04:24:21 +0300
Subject: [PATCH 05/16] Fix pipeline and build the backend

---
 .woodpecker.yaml | 26 ++++++++++++++++++--------
 backend/main.py  |  1 -
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index f11c2fa..e8a7c2f 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -57,13 +57,18 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
-        TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
-        yq -i ".frontend.tag = \"${TAG}\"" manifests/labmap/values.yaml
+        if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
+          TAG="develop-${CI_BUILD_NUMBER}"
+        else
+          TAG="${CI_COMMIT_SHA:0:7}"
+        fi
+        echo "💡 Setting frontend tag to: $TAG"
+        yq -i ".frontend.tag = \"$TAG\"" manifests/labmap/values.yaml
         git add manifests/labmap/values.yaml
-        git commit -m "frontend: update tag to ${TAG}" || echo "No changes"
+        git commit -m "frontend: update tag to $TAG" || echo "No changes"
         git push origin master
 
   update-values-backend:
@@ -82,11 +87,16 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
-        TAG=$([[ "$CI_COMMIT_BRANCH" == "develop" ]] && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}")
-        yq -i ".backend.tag = \"${TAG}\"" manifests/labmap/values.yaml
+        if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
+          TAG="develop-${CI_BUILD_NUMBER}"
+        else
+          TAG="${CI_COMMIT_SHA:0:7}"
+        fi
+        echo "💡 Setting backend tag to: $TAG"
+        yq -i ".backend.tag = \"$TAG\"" manifests/labmap/values.yaml
         git add manifests/labmap/values.yaml
-        git commit -m "backend: update tag to ${TAG}" || echo "No changes"
+        git commit -m "backend: update tag to $TAG" || echo "No changes"
         git push origin master
diff --git a/backend/main.py b/backend/main.py
index 0f6b923..21d4717 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,6 +81,5 @@ def list_icons():
     return categories
 
 
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 4cd03e5e9b12ccba86effaf484d1cd5655e495c1 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 04:26:10 +0300
Subject: [PATCH 06/16] Fix pipeline and build the backend

---
 .woodpecker.yaml | 4 ++--
 backend/main.py  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index e8a7c2f..09ce3da 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -57,7 +57,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
@@ -87,7 +87,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
diff --git a/backend/main.py b/backend/main.py
index 21d4717..0f6b923 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,5 +81,6 @@ def list_icons():
     return categories
 
 
+
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 0cce38fa68dea6b10a8335b86a04fe6860622aa8 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 05:13:31 +0300
Subject: [PATCH 07/16] Fix pipeline and build the backend

---
 .woodpecker.yaml | 7 +++++--
 backend/main.py  | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 09ce3da..f667fb3 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -11,14 +11,16 @@ steps:
       repo: my-apps/labmap-frontend
       dockerfile: frontend/Dockerfile
       context: frontend
+      TAG_SUFFIX: '${CI_COMMIT_BRANCH=="develop" ? "develop-${CI_BUILD_NUMBER}" : "${CI_COMMIT_SHA:0:7}"}'
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
-        - develop-${CI_BUILD_NUMBER}
+        - ${TAG_SUFFIX}
       username:
         from_secret: DOCKER_USERNAME
       password:
         from_secret: DOCKER_PASSWORD
+    
 
   build-backend:
     name: Build & Push Backend
@@ -32,10 +34,11 @@ steps:
       repo: my-apps/labmap-backend
       dockerfile: backend/Dockerfile
       context: backend
+      TAG_SUFFIX: '${CI_COMMIT_BRANCH=="develop" ? "develop-${CI_BUILD_NUMBER}" : "${CI_COMMIT_SHA:0:7}"}'
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
-        - develop-${CI_BUILD_NUMBER}
+        - ${TAG_SUFFIX}
       username:
         from_secret: DOCKER_USERNAME
       password:
diff --git a/backend/main.py b/backend/main.py
index 0f6b923..21d4717 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,6 +81,5 @@ def list_icons():
     return categories
 
 
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 78d26d149174e6de436f3098e107764b0e09da11 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 05:24:53 +0300
Subject: [PATCH 08/16] Fix pipeline and build the backend

---
 .woodpecker.yaml | 6 ++----
 backend/main.py  | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index f667fb3..73ee120 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -11,11 +11,10 @@ steps:
       repo: my-apps/labmap-frontend
       dockerfile: frontend/Dockerfile
       context: frontend
-      TAG_SUFFIX: '${CI_COMMIT_BRANCH=="develop" ? "develop-${CI_BUILD_NUMBER}" : "${CI_COMMIT_SHA:0:7}"}'
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
-        - ${TAG_SUFFIX}
+        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}"}
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -34,11 +33,10 @@ steps:
       repo: my-apps/labmap-backend
       dockerfile: backend/Dockerfile
       context: backend
-      TAG_SUFFIX: '${CI_COMMIT_BRANCH=="develop" ? "develop-${CI_BUILD_NUMBER}" : "${CI_COMMIT_SHA:0:7}"}'
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
-        - ${TAG_SUFFIX}
+        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}"}
       username:
         from_secret: DOCKER_USERNAME
       password:
diff --git a/backend/main.py b/backend/main.py
index 21d4717..0f6b923 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,5 +81,6 @@ def list_icons():
     return categories
 
 
+
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 647e6002a490d5a10a7596b87a3574f02f1d72ec Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 05:31:24 +0300
Subject: [PATCH 09/16] Fix pipeline and build the backend

---
 .woodpecker.yaml | 4 ++--
 backend/main.py  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 73ee120..9115655 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -14,7 +14,7 @@ steps:
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
-        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}"}
+        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_COMMIT_SHA}" || echo "${CI_COMMIT_SHA:0:7}"}
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -36,7 +36,7 @@ steps:
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:7}
-        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_BUILD_NUMBER}" || echo "${CI_COMMIT_SHA:0:7}"}
+        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_COMMIT_SHA}" || echo "${CI_COMMIT_SHA:0:7}"}
       username:
         from_secret: DOCKER_USERNAME
       password:
diff --git a/backend/main.py b/backend/main.py
index 0f6b923..21d4717 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,6 +81,5 @@ def list_icons():
     return categories
 
 
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 218682d9a816c5b6660be3c195b4ee27cd7f22d1 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 18:10:00 +0300
Subject: [PATCH 10/16] Set pipline for develop

---
 .woodpecker.yaml | 47 ++++++++++++++++++++++++++++++++++-------------
 backend/main.py  |  1 +
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 9115655..57c0e81 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,9 +1,23 @@
 steps:
+  generate-tags-frontend:
+    name: Generate Tags for Frontend
+    image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
+    when:
+      path:
+        include: [ frontend/** ]
+    settings:
+      tags: |
+        edge -b develop -v develop
+        edge -b master -v latest
+        sha
+      tags_file: .tags-frontend
+
   build-frontend:
     name: Build & Push Frontend
     image: woodpeckerci/plugin-kaniko
+    depends_on: [ generate-tags-frontend ]
     when:
-      event: [ push, pull_request, tag ]
+      event: [ push ]
       path:
         include: [ frontend/** ]
     settings:
@@ -11,21 +25,31 @@ steps:
       repo: my-apps/labmap-frontend
       dockerfile: frontend/Dockerfile
       context: frontend
-      tags:
-        - latest
-        - ${CI_COMMIT_SHA:0:7}
-        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_COMMIT_SHA}" || echo "${CI_COMMIT_SHA:0:7}"}
+      tags_file: .tags-frontend
       username:
         from_secret: DOCKER_USERNAME
       password:
         from_secret: DOCKER_PASSWORD
-    
+
+  generate-tags-backend:
+    name: Generate Tags for Backend
+    image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
+    when:
+      path:
+        include: [ backend/** ]
+    settings:
+      tags: |
+        edge -b develop -v develop
+        edge -b master -v latest
+        sha
+      tags_file: .tags-backend
 
   build-backend:
     name: Build & Push Backend
     image: woodpeckerci/plugin-kaniko
+    depends_on: [ generate-tags-backend ]
     when:
-      event: [ push, pull_request, tag ]
+      event: [ push ]
       path:
         include: [ backend/** ]
     settings:
@@ -33,10 +57,7 @@ steps:
       repo: my-apps/labmap-backend
       dockerfile: backend/Dockerfile
       context: backend
-      tags:
-        - latest
-        - ${CI_COMMIT_SHA:0:7}
-        - ${CI_COMMIT_BRANCH=="develop" && echo "develop-${CI_COMMIT_SHA}" || echo "${CI_COMMIT_SHA:0:7}"}
+      tags_file: .tags-backend
       username:
         from_secret: DOCKER_USERNAME
       password:
@@ -70,7 +91,7 @@ steps:
         yq -i ".frontend.tag = \"$TAG\"" manifests/labmap/values.yaml
         git add manifests/labmap/values.yaml
         git commit -m "frontend: update tag to $TAG" || echo "No changes"
-        git push origin master
+        git push origin HEAD
 
   update-values-backend:
     name: Update backend tag in values.yaml
@@ -100,4 +121,4 @@ steps:
         yq -i ".backend.tag = \"$TAG\"" manifests/labmap/values.yaml
         git add manifests/labmap/values.yaml
         git commit -m "backend: update tag to $TAG" || echo "No changes"
-        git push origin master
+        git push origin HEAD
diff --git a/backend/main.py b/backend/main.py
index 21d4717..0f6b923 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,5 +81,6 @@ def list_icons():
     return categories
 
 
+
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From eb3a2ab76c7f61a044d927e6604eb6ce36935202 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 18:15:20 +0300
Subject: [PATCH 11/16] Set pipline for develop

---
 .woodpecker.yaml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 57c0e81..6726aa5 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,8 +1,8 @@
 steps:
   generate-tags-frontend:
-    name: Generate Tags for Frontend
     image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
     when:
+      event: [ push ]
       path:
         include: [ frontend/** ]
     settings:
@@ -13,7 +13,6 @@ steps:
       tags_file: .tags-frontend
 
   build-frontend:
-    name: Build & Push Frontend
     image: woodpeckerci/plugin-kaniko
     depends_on: [ generate-tags-frontend ]
     when:
@@ -32,9 +31,9 @@ steps:
         from_secret: DOCKER_PASSWORD
 
   generate-tags-backend:
-    name: Generate Tags for Backend
     image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
     when:
+      event: [ push ]
       path:
         include: [ backend/** ]
     settings:
@@ -45,7 +44,6 @@ steps:
       tags_file: .tags-backend
 
   build-backend:
-    name: Build & Push Backend
     image: woodpeckerci/plugin-kaniko
     depends_on: [ generate-tags-backend ]
     when:
@@ -64,7 +62,6 @@ steps:
         from_secret: DOCKER_PASSWORD
 
   update-values-frontend:
-    name: Update frontend tag in values.yaml
     image: alpine:3.19
     when:
       event: [ push ]
@@ -79,7 +76,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
@@ -94,7 +91,6 @@ steps:
         git push origin HEAD
 
   update-values-backend:
-    name: Update backend tag in values.yaml
     image: alpine:3.19
     when:
       event: [ push ]
@@ -109,7 +105,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then

From 4624a8bf3c5d685ea1e0e9c7fb47cec6f24e47df Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 18:15:52 +0300
Subject: [PATCH 12/16] Set pipline for develop

---
 backend/main.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/main.py b/backend/main.py
index 0f6b923..21d4717 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,6 +81,5 @@ def list_icons():
     return categories
 
 
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 2e788679a709a1610ee446fd1d9de110440b541d Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 18:16:47 +0300
Subject: [PATCH 13/16] Set pipline for develop

---
 .woodpecker.yaml | 4 ++--
 backend/main.py  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 6726aa5..cc5e891 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -76,7 +76,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
@@ -105,7 +105,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
diff --git a/backend/main.py b/backend/main.py
index 21d4717..0f6b923 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,5 +81,6 @@ def list_icons():
     return categories
 
 
+
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 70f2f54548d114c8894206ad5d49c45adb6bd42b Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 18:58:55 +0300
Subject: [PATCH 14/16] Set pipline for develop

---
 .woodpecker.yaml | 97 +++++++++++++++++++++++++++++++-----------------
 backend/main.py  |  1 -
 2 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index cc5e891..648f06b 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,4 +1,13 @@
 steps:
+  # ✅ Print available ENV vars for debugging
+  debug-env:
+    image: alpine
+    commands:
+      - echo "🔍 Available ENV variables:"
+      - printenv | sort
+
+  # 🔧 FRONTEND
+
   generate-tags-frontend:
     image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
     when:
@@ -10,11 +19,19 @@ steps:
         edge -b develop -v develop
         edge -b master -v latest
         sha
+        raw -v develop-${CI_COMMIT_SHA:0:7}
       tags_file: .tags-frontend
 
+  print-tags-frontend:
+    image: alpine
+    depends_on: [ generate-tags-frontend ]
+    commands:
+      - echo "🔥 Tags to push for frontend:"
+      - cat .tags-frontend
+
   build-frontend:
     image: woodpeckerci/plugin-kaniko
-    depends_on: [ generate-tags-frontend ]
+    depends_on: [ print-tags-frontend ]
     when:
       event: [ push ]
       path:
@@ -30,39 +47,9 @@ steps:
       password:
         from_secret: DOCKER_PASSWORD
 
-  generate-tags-backend:
-    image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
-    when:
-      event: [ push ]
-      path:
-        include: [ backend/** ]
-    settings:
-      tags: |
-        edge -b develop -v develop
-        edge -b master -v latest
-        sha
-      tags_file: .tags-backend
-
-  build-backend:
-    image: woodpeckerci/plugin-kaniko
-    depends_on: [ generate-tags-backend ]
-    when:
-      event: [ push ]
-      path:
-        include: [ backend/** ]
-    settings:
-      registry: harbor.dvirlabs.com
-      repo: my-apps/labmap-backend
-      dockerfile: backend/Dockerfile
-      context: backend
-      tags_file: .tags-backend
-      username:
-        from_secret: DOCKER_USERNAME
-      password:
-        from_secret: DOCKER_PASSWORD
-
   update-values-frontend:
     image: alpine:3.19
+    depends_on: [ build-frontend ]
     when:
       event: [ push ]
       path:
@@ -80,7 +67,7 @@ steps:
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
-          TAG="develop-${CI_BUILD_NUMBER}"
+          TAG="develop-${CI_COMMIT_SHA:0:7}"
         else
           TAG="${CI_COMMIT_SHA:0:7}"
         fi
@@ -90,8 +77,50 @@ steps:
         git commit -m "frontend: update tag to $TAG" || echo "No changes"
         git push origin HEAD
 
+  # 🔧 BACKEND
+
+  generate-tags-backend:
+    image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
+    when:
+      event: [ push ]
+      path:
+        include: [ backend/** ]
+    settings:
+      tags: |
+        edge -b develop -v develop
+        edge -b master -v latest
+        sha
+        raw -v develop-${CI_COMMIT_SHA:0:7}
+      tags_file: .tags-backend
+
+  print-tags-backend:
+    image: alpine
+    depends_on: [ generate-tags-backend ]
+    commands:
+      - echo "🔥 Tags to push for backend:"
+      - cat .tags-backend
+
+  build-backend:
+    image: woodpeckerci/plugin-kaniko
+    depends_on: [ print-tags-backend ]
+    when:
+      event: [ push ]
+      path:
+        include: [ backend/** ]
+    settings:
+      registry: harbor.dvirlabs.com
+      repo: my-apps/labmap-backend
+      dockerfile: backend/Dockerfile
+      context: backend
+      tags_file: .tags-backend
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD
+
   update-values-backend:
     image: alpine:3.19
+    depends_on: [ build-backend ]
     when:
       event: [ push ]
       path:
@@ -109,7 +138,7 @@ steps:
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
-          TAG="develop-${CI_BUILD_NUMBER}"
+          TAG="develop-${CI_COMMIT_SHA:0:7}"
         else
           TAG="${CI_COMMIT_SHA:0:7}"
         fi
diff --git a/backend/main.py b/backend/main.py
index 0f6b923..21d4717 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,6 +81,5 @@ def list_icons():
     return categories
 
 
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 239854464873f3ddfd7b76735ef70bba92fb9077 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Tue, 17 Jun 2025 19:03:51 +0300
Subject: [PATCH 15/16] Set pipline for develop

---
 .woodpecker.yaml | 32 +++++++++++++++++++++++---------
 backend/main.py  |  1 +
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 648f06b..ff4e354 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,14 +1,17 @@
 steps:
-  # ✅ Print available ENV vars for debugging
   debug-env:
+    name: debug-env
     image: alpine
+    when:
+      event: [ push ]
     commands:
       - echo "🔍 Available ENV variables:"
       - printenv | sort
 
-  # 🔧 FRONTEND
+  # === FRONTEND ===
 
   generate-tags-frontend:
+    name: generate-tags-frontend
     image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
     when:
       event: [ push ]
@@ -23,19 +26,23 @@ steps:
       tags_file: .tags-frontend
 
   print-tags-frontend:
+    name: print-tags-frontend
     image: alpine
+    when:
+      event: [ push ]
     depends_on: [ generate-tags-frontend ]
     commands:
       - echo "🔥 Tags to push for frontend:"
       - cat .tags-frontend
 
   build-frontend:
+    name: build-frontend
     image: woodpeckerci/plugin-kaniko
-    depends_on: [ print-tags-frontend ]
     when:
       event: [ push ]
       path:
         include: [ frontend/** ]
+    depends_on: [ print-tags-frontend ]
     settings:
       registry: harbor.dvirlabs.com
       repo: my-apps/labmap-frontend
@@ -48,12 +55,13 @@ steps:
         from_secret: DOCKER_PASSWORD
 
   update-values-frontend:
+    name: update-values-frontend
     image: alpine:3.19
-    depends_on: [ build-frontend ]
     when:
       event: [ push ]
       path:
         include: [ frontend/** ]
+    depends_on: [ build-frontend ]
     environment:
       GIT_USERNAME:
         from_secret: GIT_USERNAME
@@ -63,7 +71,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
@@ -77,9 +85,10 @@ steps:
         git commit -m "frontend: update tag to $TAG" || echo "No changes"
         git push origin HEAD
 
-  # 🔧 BACKEND
+  # === BACKEND ===
 
   generate-tags-backend:
+    name: generate-tags-backend
     image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
     when:
       event: [ push ]
@@ -94,19 +103,23 @@ steps:
       tags_file: .tags-backend
 
   print-tags-backend:
+    name: print-tags-backend
     image: alpine
+    when:
+      event: [ push ]
     depends_on: [ generate-tags-backend ]
     commands:
       - echo "🔥 Tags to push for backend:"
       - cat .tags-backend
 
   build-backend:
+    name: build-backend
     image: woodpeckerci/plugin-kaniko
-    depends_on: [ print-tags-backend ]
     when:
       event: [ push ]
       path:
         include: [ backend/** ]
+    depends_on: [ print-tags-backend ]
     settings:
       registry: harbor.dvirlabs.com
       repo: my-apps/labmap-backend
@@ -119,12 +132,13 @@ steps:
         from_secret: DOCKER_PASSWORD
 
   update-values-backend:
+    name: update-values-backend
     image: alpine:3.19
-    depends_on: [ build-backend ]
     when:
       event: [ push ]
       path:
         include: [ backend/** ]
+    depends_on: [ build-backend ]
     environment:
       GIT_USERNAME:
         from_secret: GIT_USERNAME
@@ -134,7 +148,7 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
diff --git a/backend/main.py b/backend/main.py
index 21d4717..0f6b923 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,5 +81,6 @@ def list_icons():
     return categories
 
 
+
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)

From 2a27595a8db35fd072dec693bd585d7821e6b6a4 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Wed, 18 Jun 2025 02:22:58 +0300
Subject: [PATCH 16/16] Set pipline for develop

---
 .woodpecker.yaml | 132 +++++++++++++----------------------------------
 backend/main.py  |   1 -
 2 files changed, 36 insertions(+), 97 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index ff4e354..128d99a 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -1,67 +1,54 @@
 steps:
-  debug-env:
-    name: debug-env
-    image: alpine
-    when:
-      event: [ push ]
-    commands:
-      - echo "🔍 Available ENV variables:"
-      - printenv | sort
-
-  # === FRONTEND ===
-
-  generate-tags-frontend:
-    name: generate-tags-frontend
-    image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
-    when:
-      event: [ push ]
-      path:
-        include: [ frontend/** ]
-    settings:
-      tags: |
-        edge -b develop -v develop
-        edge -b master -v latest
-        sha
-        raw -v develop-${CI_COMMIT_SHA:0:7}
-      tags_file: .tags-frontend
-
-  print-tags-frontend:
-    name: print-tags-frontend
-    image: alpine
-    when:
-      event: [ push ]
-    depends_on: [ generate-tags-frontend ]
-    commands:
-      - echo "🔥 Tags to push for frontend:"
-      - cat .tags-frontend
-
   build-frontend:
-    name: build-frontend
+    name: Build & Push Frontend
     image: woodpeckerci/plugin-kaniko
     when:
-      event: [ push ]
+      event: [ push, pull_request, tag ]
       path:
         include: [ frontend/** ]
-    depends_on: [ print-tags-frontend ]
     settings:
       registry: harbor.dvirlabs.com
       repo: my-apps/labmap-frontend
       dockerfile: frontend/Dockerfile
       context: frontend
-      tags_file: .tags-frontend
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:7}
+        - ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD
+    
+
+  build-backend:
+    name: Build & Push Backend
+    image: woodpeckerci/plugin-kaniko
+    when:
+      event: [ push, pull_request, tag ]
+      path:
+        include: [ backend/** ]
+    settings:
+      registry: harbor.dvirlabs.com
+      repo: my-apps/labmap-backend
+      dockerfile: backend/Dockerfile
+      context: backend
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:7}
+        - ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
       username:
         from_secret: DOCKER_USERNAME
       password:
         from_secret: DOCKER_PASSWORD
 
   update-values-frontend:
-    name: update-values-frontend
+    name: Update frontend tag in values.yaml
     image: alpine:3.19
     when:
       event: [ push ]
       path:
         include: [ frontend/** ]
-    depends_on: [ build-frontend ]
     environment:
       GIT_USERNAME:
         from_secret: GIT_USERNAME
@@ -71,11 +58,11 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
-          TAG="develop-${CI_COMMIT_SHA:0:7}"
+          TAG="develop-${CI_BUILD_NUMBER}"
         else
           TAG="${CI_COMMIT_SHA:0:7}"
         fi
@@ -83,62 +70,15 @@ steps:
         yq -i ".frontend.tag = \"$TAG\"" manifests/labmap/values.yaml
         git add manifests/labmap/values.yaml
         git commit -m "frontend: update tag to $TAG" || echo "No changes"
-        git push origin HEAD
-
-  # === BACKEND ===
-
-  generate-tags-backend:
-    name: generate-tags-backend
-    image: ghcr.io/dvjn/woodpecker-docker-tags-plugin
-    when:
-      event: [ push ]
-      path:
-        include: [ backend/** ]
-    settings:
-      tags: |
-        edge -b develop -v develop
-        edge -b master -v latest
-        sha
-        raw -v develop-${CI_COMMIT_SHA:0:7}
-      tags_file: .tags-backend
-
-  print-tags-backend:
-    name: print-tags-backend
-    image: alpine
-    when:
-      event: [ push ]
-    depends_on: [ generate-tags-backend ]
-    commands:
-      - echo "🔥 Tags to push for backend:"
-      - cat .tags-backend
-
-  build-backend:
-    name: build-backend
-    image: woodpeckerci/plugin-kaniko
-    when:
-      event: [ push ]
-      path:
-        include: [ backend/** ]
-    depends_on: [ print-tags-backend ]
-    settings:
-      registry: harbor.dvirlabs.com
-      repo: my-apps/labmap-backend
-      dockerfile: backend/Dockerfile
-      context: backend
-      tags_file: .tags-backend
-      username:
-        from_secret: DOCKER_USERNAME
-      password:
-        from_secret: DOCKER_PASSWORD
+        git push origin master
 
   update-values-backend:
-    name: update-values-backend
+    name: Update backend tag in values.yaml
     image: alpine:3.19
     when:
       event: [ push ]
       path:
         include: [ backend/** ]
-    depends_on: [ build-backend ]
     environment:
       GIT_USERNAME:
         from_secret: GIT_USERNAME
@@ -148,11 +88,11 @@ steps:
       - apk add --no-cache git yq
       - git config --global user.name "woodpecker-bot"
       - git config --global user.email "ci@dvirlabs.com"
-      - git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
+      - git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
       - cd my-apps
       - |
         if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
-          TAG="develop-${CI_COMMIT_SHA:0:7}"
+          TAG="develop-${CI_BUILD_NUMBER}"
         else
           TAG="${CI_COMMIT_SHA:0:7}"
         fi
@@ -160,4 +100,4 @@ steps:
         yq -i ".backend.tag = \"$TAG\"" manifests/labmap/values.yaml
         git add manifests/labmap/values.yaml
         git commit -m "backend: update tag to $TAG" || echo "No changes"
-        git push origin HEAD
+        git push origin master
diff --git a/backend/main.py b/backend/main.py
index 0f6b923..21d4717 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,6 +81,5 @@ def list_icons():
     return categories
 
 
-
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=8000)