From ff26c3a53933bb0fe5b170cfa41614b0aa69d373 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Thu, 8 Feb 2024 03:15:07 +0900
Subject: [PATCH] Prepare universal workflow

---
 .github/workflows/images_build.yml | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml
index aca0e7a06..558eb0972 100644
--- a/.github/workflows/images_build.yml
+++ b/.github/workflows/images_build.yml
@@ -177,8 +177,35 @@ jobs:
           flavor: |
             latest=false
 
+      - name: Build ${{ env.BASE_BUILD_NAME }}/${{ matrix.os }} and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          context: ./Dockerfiles/${{ env.BASE_BUILD_NAME }}/${{ matrix.os }}
+          file: ./Dockerfiles/${{ env.BASE_BUILD_NAME }}/${{ matrix.os }}/Dockerfile
+          platforms: ${{ steps.platform.outputs.list }}
+          push: ${{ secrets.AUTO_PUSH_IMAGES }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: |
+            org.opencontainers.image.revision=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            org.opencontainers.image.created=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
+
+
       - name: Test Output
         id: meta
         run: |
-            echo "${{ toJSON(steps.meta_release) }}"
+            echo "${{ toJSON(steps.meta_release.conclusion) }}"
             echo "${{ steps.meta_trunk.outputs.tags }}"
+
+      - name: Build ${{ env.BASE_BUILD_NAME }}/${{ matrix.os }} and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          context: ./Dockerfiles/${{ env.BASE_BUILD_NAME }}/${{ matrix.os }}
+          file: ./Dockerfiles/${{ env.BASE_BUILD_NAME }}/${{ matrix.os }}/Dockerfile
+          platforms: ${{ steps.platform.outputs.list }}
+          push: ${{ secrets.AUTO_PUSH_IMAGES }}
+          tags: ${{ steps.meta_release.conclusion == 'skipped' && steps.meta_trunk.outputs.tags || steps.meta_release.outputs.tags }}
+          labels: |
+            org.opencontainers.image.revision=${{ steps.meta_release.conclusion == 'skipped' && fromJSON(steps.meta_trunk.outputs.json).labels['org.opencontainers.image.revision'] || fromJSON(steps.meta_release.outputs.json).labels['org.opencontainers.image.revision'] }}
+            org.opencontainers.image.created=${{ steps.meta_release.conclusion == 'skipped' && fromJSON(steps.meta_trunk.outputs.json).labels['org.opencontainers.image.created'] || fromJSON(steps.meta_release.outputs.json).labels['org.opencontainers.image.created'] }}