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] 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)