From 22ad4512c25e9c7daa4e449aa1340acbd203c6bc Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Wed, 14 Feb 2024 22:40:20 +0900
Subject: [PATCH] RHEL build test

---
 .github/workflows/images_build_rhel.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml
index 67a0e41d1..7b17bdca3 100644
--- a/.github/workflows/images_build_rhel.yml
+++ b/.github/workflows/images_build_rhel.yml
@@ -203,7 +203,7 @@ jobs:
           IMAGE_TAG: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
           CACHE_FILE_NAME: ${{ env.BASE_BUILD_NAME }}_${{ matrix.arch }}
         run: |
-            DIGEST=$(podman inspect ${IMAGE_TAG} --format "{{ index .RepoDigests 0}}" | cut -d '@' -f2)
+            DIGEST=$(podman inspect ${IMAGE_TAG} --format "{{.Id}}")
             echo "::group::Image digest"
             echo "$DIGEST"
             echo "::endgroup::"
@@ -268,14 +268,16 @@ jobs:
          IMAGES_PREFIX: ${{ env.IMAGES_PREFIX }}
         run: |
             BASE_TAG=$(cat "${BASE_IMAGE}_${MATRIX_ARCH}")
-            BUILD_BASE_IMAGE="${IMAGES_PREFIX}${BASE_IMAGE}@${BASE_TAG}"
+            BUILD_BASE_IMAGE="${IMAGES_PREFIX}${BASE_IMAGE}:${BASE_TAG}"
 
             echo "::group::Base build image information"
             echo "base_tag=${BASE_TAG}"
             echo "base_build_image=${BUILD_BASE_IMAGE}"
             echo "::endgroup::"
             echo "podman pull \"dir:/tmp/images/${BASE_TAG}\""
+            echo "podman tag ${BASE_TAG} ${BUILD_BASE_IMAGE}"
             podman pull dir:"/tmp/images/${BASE_TAG}"
+            podman tag ${BASE_TAG} ${BUILD_BASE_IMAGE}
 
             echo "base_tag=${BASE_TAG}" >> $GITHUB_OUTPUT
             echo "base_build_image=${BUILD_BASE_IMAGE}" >> $GITHUB_OUTPUT
@@ -296,7 +298,7 @@ jobs:
           IMAGE_TAG: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
           CACHE_FILE_NAME: ${{ matrix.build }}_${{ matrix.arch }}
         run: |
-            DIGEST=$(podman inspect ${IMAGE_TAG} --format "{{ index .RepoDigests 0}}" | cut -d '@' -f2)
+            DIGEST=$(podman inspect ${IMAGE_TAG} --format "{{.Id}}")
             echo "::group::Image digest"
             echo "$DIGEST"
             echo "::endgroup::"
@@ -393,14 +395,16 @@ jobs:
          IMAGES_PREFIX: ${{ env.IMAGES_PREFIX }}
         run: |
             BASE_TAG=$(cat "${BASE_IMAGE}_${MATRIX_ARCH}")
-            BUILD_BASE_IMAGE="${IMAGES_PREFIX}${BASE_IMAGE}@${BASE_TAG}"
+            BUILD_BASE_IMAGE="${IMAGES_PREFIX}${BASE_IMAGE}:${BASE_TAG}"
 
             echo "::group::Base build image information"
             echo "base_tag=${BASE_TAG}"
             echo "base_build_image=${BUILD_BASE_IMAGE}"
             echo "::endgroup::"
             echo "podman pull \"dir:/tmp/images/${BASE_TAG}\""
+            echo "podman tag ${BASE_TAG} ${BUILD_BASE_IMAGE}"
             podman pull dir:"/tmp/images/${BASE_TAG}"
+            podman tag ${BASE_TAG} ${BUILD_BASE_IMAGE}
 
             echo "base_tag=${BASE_TAG}" >> $GITHUB_OUTPUT
             echo "base_build_image=${BUILD_BASE_IMAGE}" >> $GITHUB_OUTPUT