From 372b02b9ade5d6217fc71bab89a53f271262dca5 Mon Sep 17 00:00:00 2001 From: Steven Skeard Date: Fri, 26 Sep 2025 13:26:20 -0400 Subject: [PATCH] Fix parsing image from dockerfile - We should use the entire image name + tag + digest instead of just parsing the name+tag AI-attribution: AIA,Entirely human-created,v1.0 For more information on AI attribution statements, see: https://aiattribution.github.io/ --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e70a5223..94a09def 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,8 @@ RHEL9_RELEASE ?= $(shell awk '/registry\.redhat\.io\/rhel9.*-els\/rhel:/ {split( RHEL9_RELEASE_DASHED := $(subst .,-,$(RHEL9_RELEASE)) # These images are extracted from the Containerfile `FROM` lines -RHEL9_IMAGE ?= $(shell awk '/^FROM registry\.redhat\.io\/rhel9.*-els\/rhel:/ {split($$2, parts, /[ @]/); print parts[1]}' $(PROJECT_DIR)/.konflux/Dockerfile) -RHEL9_MINIMAL_IMAGE ?= $(shell awk '/^FROM registry\.redhat\.io\/rhel9.*-els\/rhel-minimal:/ {split($$2, parts, /[ @]/); print parts[1]}' $(PROJECT_DIR)/.konflux/Dockerfile) +RHEL9_IMAGE ?= $(shell awk '/^FROM registry\.redhat\.io\/rhel9.*-els\/rhel:/ {print $$2}' $(PROJECT_DIR)/.konflux/Dockerfile) +RHEL9_MINIMAL_IMAGE ?= $(shell awk '/^FROM registry\.redhat\.io\/rhel9.*-els\/rhel-minimal:/ {print $$2}' $(PROJECT_DIR)/.konflux/Dockerfile) # YAMLLINT_VERSION defines the yamllint version to download from GitHub releases. YAMLLINT_VERSION ?= 1.35.1