Skip to content

Commit e215388

Browse files
authored
Merge pull request #564 from openshift-cherrypick-robot/cherry-pick-562-to-release-4.18
[release-4.18] Fix parsing image from dockerfile
2 parents 4526bc5 + 372b02b commit e215388

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ RHEL9_RELEASE ?= $(shell awk '/registry\.redhat\.io\/rhel9.*-els\/rhel:/ {split(
2929
RHEL9_RELEASE_DASHED := $(subst .,-,$(RHEL9_RELEASE))
3030

3131
# These images are extracted from the Containerfile `FROM` lines
32-
RHEL9_IMAGE ?= $(shell awk '/^FROM registry\.redhat\.io\/rhel9.*-els\/rhel:/ {split($$2, parts, /[ @]/); print parts[1]}' $(PROJECT_DIR)/.konflux/Dockerfile)
33-
RHEL9_MINIMAL_IMAGE ?= $(shell awk '/^FROM registry\.redhat\.io\/rhel9.*-els\/rhel-minimal:/ {split($$2, parts, /[ @]/); print parts[1]}' $(PROJECT_DIR)/.konflux/Dockerfile)
32+
RHEL9_IMAGE ?= $(shell awk '/^FROM registry\.redhat\.io\/rhel9.*-els\/rhel:/ {print $$2}' $(PROJECT_DIR)/.konflux/Dockerfile)
33+
RHEL9_MINIMAL_IMAGE ?= $(shell awk '/^FROM registry\.redhat\.io\/rhel9.*-els\/rhel-minimal:/ {print $$2}' $(PROJECT_DIR)/.konflux/Dockerfile)
3434

3535
# YAMLLINT_VERSION defines the yamllint version to download from GitHub releases.
3636
YAMLLINT_VERSION ?= 1.35.1

0 commit comments

Comments
 (0)