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] 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 },