From 93456d04e0dcb352f2fb1b26dc523f6b97a101e5 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 14 Feb 2024 16:37:00 +0900
Subject: [PATCH 1/4] Prepare RHEL workflow for secrets

---
 .github/workflows/images_build_rhel.yml | 11 ++++++++++-
 build.json                              |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml
index 707da7286..1fe0da233 100644
--- a/.github/workflows/images_build_rhel.yml
+++ b/.github/workflows/images_build_rhel.yml
@@ -4,6 +4,15 @@ on:
   release:
     types:
       - published
+  push:
+    branches:
+      - '[0-9]+.[0-9]+'
+      - 'trunk'
+    paths:
+      - 'Dockerfiles/*/rhel/*'
+      - 'build.json'
+      - '!**/README.md'
+      - '.github/workflows/images_build_rhel.yml'
   workflow_dispatch:
 
 defaults:
@@ -14,7 +23,7 @@ permissions:
    contents: read
 
 env:
-  AUTO_PUSH_IMAGES: ${{ vars.AUTO_PUSH_IMAGES }}
+  AUTO_PUSH_IMAGES: ${{ contains(fromJSON('["workflow_dispatch", "push"]'), github.event_name) && 'false' || vars.AUTO_PUSH_IMAGES }}
 
   LATEST_BRANCH: ${{ github.event.repository.default_branch }}
   TRUNK_GIT_BRANCH: "refs/heads/trunk"
diff --git a/build.json b/build.json
index 11e137493..931d9aa08 100644
--- a/build.json
+++ b/build.json
@@ -41,7 +41,7 @@
     "server-mysql": { "base" : "build-mysql", "rhel" : true },
     "server-pgsql": { "base" : "build-pgsql", "rhel" : false },
     "snmptraps": { "base" : "", "rhel" : true },
-    "web-apache-mysql": { "base" : "build-mysql", "rhel" : true },
+    "web-apache-mysql": { "base" : "build-mysql", "rhel" : false },
     "web-apache-pgsql": { "base" : "build-pgsql", "rhel" : false },
     "web-nginx-mysql": { "base" : "build-mysql", "rhel" : true },
     "web-nginx-pgsql": { "base" : "build-mysql", "rhel" : false },

From 9f0f2786d0397b6ccfbc11ec019e6fca6b19f077 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 14 Feb 2024 16:55:25 +0900
Subject: [PATCH 2/4] Prepare RHEL workflow for secrets

---
 .github/workflows/images_build_rhel.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml
index 1fe0da233..14ffcdb3d 100644
--- a/.github/workflows/images_build_rhel.yml
+++ b/.github/workflows/images_build_rhel.yml
@@ -374,6 +374,7 @@ jobs:
             suffix=${{ matrix.arch == 'ARM64' && '-arm64' || '' }},onlatest=true
 
       - name: Download SHA256 tag of ${{ steps.build_base_image.outputs.build_base }}:${{ matrix.arch }}
+        if: ${{ matrix.build != 'snmptraps' }}
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
           path: ${{ steps.build_base_image.outputs.build_base }}_${{ matrix.arch }}
@@ -381,6 +382,7 @@ jobs:
 
       - name: Retrieve ${{ steps.build_base_image.outputs.build_base }}:${{ matrix.arch }} SHA256 tag
         id: base_build
+        if: ${{ matrix.build != 'snmptraps' }}
         env:
          MATRIX_ARCH: ${{ matrix.arch }}
          BASE_IMAGE: ${{ steps.build_base_image.outputs.build_base }}

From c9bd3d34e279b4463faf8b6c3639cc6337d2fe91 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 14 Feb 2024 16:56:57 +0900
Subject: [PATCH 3/4] Prepare RHEL workflow for secrets

---
 .github/workflows/images_build_rhel.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml
index 14ffcdb3d..105f17759 100644
--- a/.github/workflows/images_build_rhel.yml
+++ b/.github/workflows/images_build_rhel.yml
@@ -329,7 +329,10 @@ jobs:
         run: |
             MATRIX_BUILD=${MATRIX_BUILD^^}
             MATRIX_BUILD=${MATRIX_BUILD//-/_}
-            echo "matrix_build=${MATRIX_BUILD,,}" >> $GITHUB_OUTPUT
+            echo "::group::Result"
+            echo "matrix_build=${MATRIX_BUILD}"
+            echo "::endgroup::"
+            echo "matrix_build=${MATRIX_BUILD}" >> $GITHUB_OUTPUT
 
       - name: Detect Build Base Image
         id: build_base_image

From cd264f6066e6bf3e46958aab1baa30129f3fdc7a Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 14 Feb 2024 16:57:48 +0900
Subject: [PATCH 4/4] Prepare RHEL workflow for secrets

---
 .github/workflows/images_build_rhel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml
index 105f17759..708dd6d62 100644
--- a/.github/workflows/images_build_rhel.yml
+++ b/.github/workflows/images_build_rhel.yml
@@ -23,7 +23,7 @@ permissions:
    contents: read
 
 env:
-  AUTO_PUSH_IMAGES: ${{ contains(fromJSON('["workflow_dispatch", "push"]'), github.event_name) && 'false' || vars.AUTO_PUSH_IMAGES }}
+  AUTO_PUSH_IMAGES: ${{ vars.AUTO_PUSH_IMAGES }}
 
   LATEST_BRANCH: ${{ github.event.repository.default_branch }}
   TRUNK_GIT_BRANCH: "refs/heads/trunk"