From 99447b874b0571fd9ea61b004bd78476a72a547a Mon Sep 17 00:00:00 2001
From: "d.viti" <d.viti@vargroup.it>
Date: Fri, 3 Oct 2025 01:32:12 +0200
Subject: [PATCH] refactor: update build workflow to use dynamic registry and
 improve login steps

---
 .gitea/workflows/build.yml | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 3079683..b9b3c34 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -1,7 +1,10 @@
-name: Build and Push Docker Images
+name: Build and Deploy
 
 on:
   push:
+    branches: [main]
+  pull_request:
+    branches: [main]
   workflow_dispatch:
 
 jobs:
@@ -14,18 +17,19 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Gitea Container Registry
+      - name: Log in to Container Registry
+        if: github.event_name == 'push'
         uses: docker/login-action@v3
         with:
-          registry: git.commandware.com
-          username: ${{ gitea.actor }}
+          registry: ${{ vars.DOCKER_REGISTRY || gitea.server_url }}
+          username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PACKAGES_PUSH_TOKEN }}
 
       - name: Extract metadata for web image
         id: meta-web
         uses: docker/metadata-action@v5
         with:
-          images: git.commandware.com/demos/api7-demo/web
+          images: ${{ vars.DOCKER_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/web
           tags: |
             type=ref,event=branch
 
@@ -34,11 +38,11 @@ jobs:
         with:
           context: ./web
           file: ./web/Dockerfile
-          push: true
+          push: ${{ github.event_name == 'push' }}
           tags: ${{ steps.meta-web.outputs.tags }}
           labels: ${{ steps.meta-web.outputs.labels }}
-          cache-from: type=registry,ref=git.commandware.com/demos/api7-demo/web:buildcache
-          cache-to: type=registry,ref=git.commandware.com/demos/api7-demo/web:buildcache,mode=max
+          cache-from: type=registry,ref=${{ vars.DOCKER_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/web:buildcache
+          cache-to: type=registry,ref=${{ vars.DOCKER_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/web:buildcache,mode=max
 
   build-api:
     runs-on: ubuntu-latest
@@ -49,18 +53,19 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Gitea Container Registry
+      - name: Log in to Container Registry
+        if: github.event_name == 'push'
         uses: docker/login-action@v3
         with:
-          registry: git.commandware.com
-          username: ${{ gitea.actor }}
+          registry: ${{ vars.DOCKER_REGISTRY || gitea.server_url }}
+          username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PACKAGES_PUSH_TOKEN }}
 
       - name: Extract metadata for api image
         id: meta-api
         uses: docker/metadata-action@v5
         with:
-          images: git.commandware.com/demos/api7-demo/api
+          images: ${{ vars.DOCKER_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/api
           tags: |
             type=ref,event=branch
 
@@ -69,8 +74,8 @@ jobs:
         with:
           context: ./api
           file: ./api/Dockerfile
-          push: true
+          push: ${{ github.event_name == 'push' }}
           tags: ${{ steps.meta-api.outputs.tags }}
           labels: ${{ steps.meta-api.outputs.labels }}
-          cache-from: type=registry,ref=git.commandware.com/demos/api7-demo/api:buildcache
-          cache-to: type=registry,ref=git.commandware.com/demos/api7-demo/api:buildcache,mode=max
+          cache-from: type=registry,ref=${{ vars.DOCKER_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/api:buildcache
+          cache-to: type=registry,ref=${{ vars.DOCKER_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/api:buildcache,mode=max