From a43c50a760bb93c5044af56da61064f59dbf54df Mon Sep 17 00:00:00 2001 From: Vincent Shen Date: Wed, 12 Aug 2026 11:04:09 -0700 Subject: [PATCH] Keep OPENSCAP_IMAGE defaulting to the manifest image Since #1295 the manifests default to the Konflux openscap-dev:master image, but OPENSCAP_IMAGE still defaulted to the ghcr openscap-ocp image - whose publisher #1295 removed, freezing that tag permanently. Because the deploy targets substitute DEFAULT_OPENSCAP_IMAGE with OPENSCAP_IMAGE, a plain 'make deploy' swapped the fresh Konflux image out for the frozen ghcr one. Restore the invariant that an unset OPENSCAP_IMAGE equals the manifest default, so the substitution is a no-op unless a developer overrides it. Co-Authored-By: Claude Opus 4.8 (1M context) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 313658bdf2..96ae8b852a 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ DEFAULT_OPENSCAP_TAG=latest OPENSCAP_TAG?=$(DEFAULT_OPENSCAP_TAG) OPENSCAP_DOCKER_FILE=./images/openscap/Containerfile DEFAULT_OPENSCAP_IMAGE=$(DEFAULT_KONFLUX_REPO)/$(APP_NAME)-openscap-dev:$(DEFAULT_KONFLUX_TAG) -OPENSCAP_IMAGE?=$(DEFAULT_REPO)/$(OPENSCAP_NAME):$(OPENSCAP_TAG) +OPENSCAP_IMAGE?=$(DEFAULT_OPENSCAP_IMAGE) # Image path to use. Set this if you want to use a specific path for building # or your e2e tests. This is overwritten if we build the image and push it to