diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml index 707da7286..708dd6d62 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: @@ -320,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 @@ -365,6 +377,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 }} @@ -372,6 +385,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 }} 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 },