From 26340abbaa39968bd31ae4e7eed72513caf1741a Mon Sep 17 00:00:00 2001
From: max5dt <maksim@composabilitylabs.org>
Date: Thu, 31 Oct 2024 13:31:54 +0000
Subject: [PATCH 1/3] add build workflow

---
 .github/workflows/docker-build.yaml | 33 +++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/docker-build.yaml

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
new file mode 100644
index 0000000..4f408e7
--- /dev/null
+++ b/.github/workflows/docker-build.yaml
@@ -0,0 +1,33 @@
+name: Build and Push Docker Image with Buildx
+
+on:
+  push:
+    branches:
+      - main
+      - build-workflow
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: compolabs
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Registry
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: ${{ vars.DOCKER_REPOSITORY }}/sprk/spark-middleware:${{ github.ref_name }}

From 2bda65d67d49f8539aa84033640ee87cbae454d9 Mon Sep 17 00:00:00 2001
From: max5dt <86766028+max5dt@users.noreply.github.com>
Date: Thu, 31 Oct 2024 15:43:39 +0200
Subject: [PATCH 2/3] Fix registry and label in docker-build.yaml

---
 .github/workflows/docker-build.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 4f408e7..0226e8a 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -20,6 +20,7 @@ jobs:
       - name: Login to Docker Registry
         uses: docker/login-action@v3
         with:
+          registry: ${{ vars.DOCKER_REGISTRY }}
           username: ${{ vars.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
@@ -30,4 +31,4 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           push: true
-          tags: ${{ vars.DOCKER_REPOSITORY }}/sprk/spark-middleware:${{ github.ref_name }}
+          tags: sprk/spark-middleware:${{ github.sha }}

From 4366ec2e17bc5b3bc610e46dc33d6c0a58a8ee8c Mon Sep 17 00:00:00 2001
From: STASiAN <mail@stasian.ru>
Date: Thu, 31 Oct 2024 17:56:23 +0200
Subject: [PATCH 3/3] Update docker-build.yaml

---
 .github/workflows/docker-build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 0226e8a..93db249 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - build-workflow
+      - dev
   pull_request:
     branches:
       - main
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    runs-on: compolabs
+    runs-on: ${{ vars.RUNNER_SCALE_SET }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -31,4 +31,4 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           push: true
-          tags: sprk/spark-middleware:${{ github.sha }}
+          tags: ${{ vars.DOCKER_PROJECT }}/${{ vars.DOCKER_IMAGE }}:${{ github.sha }}